mirror of
https://github.com/microsoft/UVAtlas
synced 2024-09-19 14:20:00 +00:00
Fix pipeline warnings (#153)
This commit is contained in:
parent
2725a1266d
commit
f216bc9ae0
@ -28,6 +28,7 @@ variables:
|
|||||||
EXTRACTED_FOLDER: $(ExtractedFolder)
|
EXTRACTED_FOLDER: $(ExtractedFolder)
|
||||||
WSDKEnableBWOI: true
|
WSDKEnableBWOI: true
|
||||||
URL_FEED: $(ADOFeedURL)
|
URL_FEED: $(ADOFeedURL)
|
||||||
|
skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: windows-2022
|
vmImage: windows-2022
|
||||||
@ -50,7 +51,7 @@ jobs:
|
|||||||
displayName: 'NuGet set package source to ADO feed'
|
displayName: 'NuGet set package source to ADO feed'
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
arguments: sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: 'Set nuget.config to single source'
|
displayName: 'Set nuget.config to single source'
|
||||||
inputs:
|
inputs:
|
||||||
@ -62,6 +63,8 @@ jobs:
|
|||||||
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
||||||
$doc.OuterXml | Set-Content $file
|
$doc.OuterXml | Set-Content $file
|
||||||
|
|
||||||
|
- task: nuget-security-analysis@0
|
||||||
|
displayName: 'Secure Supply Chain Analysis'
|
||||||
- task: NuGetCommand@2
|
- task: NuGetCommand@2
|
||||||
displayName: NuGet Install WSDK x64
|
displayName: NuGet Install WSDK x64
|
||||||
inputs:
|
inputs:
|
||||||
@ -148,7 +151,7 @@ jobs:
|
|||||||
displayName: NuGet set package source to ADO feed
|
displayName: NuGet set package source to ADO feed
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
arguments: sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: 'Set nuget.config to single source'
|
displayName: 'Set nuget.config to single source'
|
||||||
inputs:
|
inputs:
|
||||||
@ -160,6 +163,8 @@ jobs:
|
|||||||
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
||||||
$doc.OuterXml | Set-Content $file
|
$doc.OuterXml | Set-Content $file
|
||||||
|
|
||||||
|
- task: nuget-security-analysis@0
|
||||||
|
displayName: 'Secure Supply Chain Analysis'
|
||||||
- task: NuGetCommand@2
|
- task: NuGetCommand@2
|
||||||
displayName: NuGet Install WSDK x64
|
displayName: NuGet Install WSDK x64
|
||||||
inputs:
|
inputs:
|
||||||
|
@ -28,6 +28,7 @@ variables:
|
|||||||
EXTRACTED_FOLDER: $(ExtractedFolder)
|
EXTRACTED_FOLDER: $(ExtractedFolder)
|
||||||
WSDKEnableBWOI: true
|
WSDKEnableBWOI: true
|
||||||
URL_FEED: $(ADOFeedURL)
|
URL_FEED: $(ADOFeedURL)
|
||||||
|
skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: windows-2022
|
vmImage: windows-2022
|
||||||
@ -50,7 +51,7 @@ jobs:
|
|||||||
displayName: 'NuGet set package source to ADO feed'
|
displayName: 'NuGet set package source to ADO feed'
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
arguments: sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: 'Set nuget.config to single source'
|
displayName: 'Set nuget.config to single source'
|
||||||
inputs:
|
inputs:
|
||||||
@ -62,6 +63,8 @@ jobs:
|
|||||||
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
||||||
$doc.OuterXml | Set-Content $file
|
$doc.OuterXml | Set-Content $file
|
||||||
|
|
||||||
|
- task: nuget-security-analysis@0
|
||||||
|
displayName: 'Secure Supply Chain Analysis'
|
||||||
- task: NuGetCommand@2
|
- task: NuGetCommand@2
|
||||||
displayName: NuGet Install WSDK x64
|
displayName: NuGet Install WSDK x64
|
||||||
inputs:
|
inputs:
|
||||||
@ -148,7 +151,7 @@ jobs:
|
|||||||
displayName: NuGet set package source to ADO feed
|
displayName: NuGet set package source to ADO feed
|
||||||
inputs:
|
inputs:
|
||||||
command: custom
|
command: custom
|
||||||
arguments: sources add -Name xboxgdk-DirectXMesh -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: 'Set nuget.config to single source'
|
displayName: 'Set nuget.config to single source'
|
||||||
inputs:
|
inputs:
|
||||||
@ -160,6 +163,8 @@ jobs:
|
|||||||
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
||||||
$doc.OuterXml | Set-Content $file
|
$doc.OuterXml | Set-Content $file
|
||||||
|
|
||||||
|
- task: nuget-security-analysis@0
|
||||||
|
displayName: 'Secure Supply Chain Analysis'
|
||||||
- task: NuGetCommand@2
|
- task: NuGetCommand@2
|
||||||
displayName: NuGet Install WSDK x64
|
displayName: NuGet Install WSDK x64
|
||||||
inputs:
|
inputs:
|
||||||
|
@ -27,8 +27,10 @@ variables:
|
|||||||
VS_GENERATOR: 'Visual Studio 17 2022'
|
VS_GENERATOR: 'Visual Studio 17 2022'
|
||||||
VCPKG_CMAKE_DIR: '$(VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake'
|
VCPKG_CMAKE_DIR: '$(VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake'
|
||||||
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
|
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
|
||||||
|
URL_FEED: $(ADOFeedURL)
|
||||||
Codeql.Language: cpp
|
Codeql.Language: cpp
|
||||||
Codeql.ExcludePathPatterns: vcpkg
|
Codeql.ExcludePathPatterns: vcpkg
|
||||||
|
skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: windows-2022
|
vmImage: windows-2022
|
||||||
@ -42,6 +44,24 @@ jobs:
|
|||||||
- checkout: self
|
- checkout: self
|
||||||
clean: true
|
clean: true
|
||||||
fetchTags: false
|
fetchTags: false
|
||||||
|
- task: NuGetCommand@2
|
||||||
|
displayName: 'NuGet set package source to ADO feed'
|
||||||
|
inputs:
|
||||||
|
command: custom
|
||||||
|
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||||
|
- task: PowerShell@2
|
||||||
|
displayName: 'Set nuget.config to single source'
|
||||||
|
inputs:
|
||||||
|
targetType: inline
|
||||||
|
script: |
|
||||||
|
$file = '.\NuGet.Config'
|
||||||
|
$doc = [xml](Get-Content $file)
|
||||||
|
$newelement = $doc.CreateElement("clear")
|
||||||
|
$clearadd = $doc.configuration.packageSources.PrependChild($newelement)
|
||||||
|
$doc.OuterXml | Set-Content $file
|
||||||
|
|
||||||
|
- task: nuget-security-analysis@0
|
||||||
|
displayName: 'Secure Supply Chain Analysis'
|
||||||
- task: NodeTool@0
|
- task: NodeTool@0
|
||||||
displayName: 'NPM install'
|
displayName: 'NPM install'
|
||||||
inputs:
|
inputs:
|
||||||
@ -80,9 +100,9 @@ jobs:
|
|||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
call vcpkg install directx-headers
|
call vcpkg install directx-headers
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
call vcpkg install directxmesh
|
call vcpkg install directxmesh[spectre]
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
call vcpkg install directxtex
|
call vcpkg install directxtex[spectre]
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
:finish
|
:finish
|
||||||
@echo --- VCPKG COMPLETE ---
|
@echo --- VCPKG COMPLETE ---
|
||||||
|
Loading…
Reference in New Issue
Block a user