Build pipeline updates (#510)
This commit is contained in:
Родитель
061355c9fd
Коммит
118ca16e04
|
@ -57,8 +57,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -82,6 +80,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet install PGDK
|
||||
inputs:
|
||||
|
|
|
@ -75,8 +75,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -100,6 +98,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet install PGDK
|
||||
inputs:
|
||||
|
|
|
@ -59,8 +59,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -84,6 +82,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet install PGDK
|
||||
inputs:
|
||||
|
@ -211,8 +211,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -236,6 +234,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet install PGDK
|
||||
inputs:
|
||||
|
@ -317,8 +317,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -342,6 +340,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet install PGDK
|
||||
inputs:
|
||||
|
|
|
@ -79,8 +79,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -104,6 +102,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet install PGDK
|
||||
inputs:
|
||||
|
|
|
@ -45,8 +45,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -70,6 +68,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet Install WSDK x64
|
||||
inputs:
|
||||
|
@ -172,8 +172,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -196,6 +194,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet Install WSDK x64
|
||||
inputs:
|
||||
|
@ -245,6 +245,7 @@ jobs:
|
|||
msbuildArgs: /p:PreferredToolArchitecture=x64
|
||||
platform: x64
|
||||
configuration: Release
|
||||
# Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
|
||||
- task: VSBuild@1
|
||||
displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
|
||||
inputs:
|
||||
|
|
|
@ -45,8 +45,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -70,6 +68,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet Install WSDK x64
|
||||
inputs:
|
||||
|
@ -172,8 +172,6 @@ jobs:
|
|||
fetchTags: false
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
inputs:
|
||||
versionSpec: '6.5.x'
|
||||
- task: PowerShell@2
|
||||
displayName: 'Create nuget.config with single source'
|
||||
inputs:
|
||||
|
@ -196,6 +194,8 @@ jobs:
|
|||
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
|
||||
- task: nuget-security-analysis@0
|
||||
displayName: 'Secure Supply Chain Analysis'
|
||||
- task: NuGetAuthenticate@1
|
||||
displayName: 'NuGet Auth'
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet Install WSDK x64
|
||||
inputs:
|
||||
|
@ -245,6 +245,7 @@ jobs:
|
|||
msbuildArgs: /p:PreferredToolArchitecture=x64
|
||||
platform: x64
|
||||
configuration: Release
|
||||
# Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
|
||||
- task: VSBuild@1
|
||||
displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
|
||||
inputs:
|
||||
|
|
|
@ -18,6 +18,21 @@
|
|||
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(GDKEditionNumber)' < '220300'">
|
||||
<_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
|
||||
<_XboxNuGetPackage>Microsoft.GDK</_XboxNuGetPackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(GDKEditionNumber)' >= '220300'">
|
||||
<_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
|
||||
<_XboxNuGetPackage>Microsoft.GDK.Xbox</_XboxNuGetPackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(GDKEditionNumber)' < '241000'">
|
||||
<_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
|
||||
<_XboxNuGetPackage>$(_XboxNuGetPackage).$(GDKEditionNumber)</_XboxNuGetPackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Windows 10 SDK NuGet -->
|
||||
<Import Condition="'$(WSDKEnableBWOI)' == 'true'"
|
||||
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
|
||||
|
@ -32,11 +47,16 @@
|
|||
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
|
||||
|
||||
<!-- Microsoft GDK NuGet -->
|
||||
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\build\Microsoft.GDK.PC.$(GDKEditionNumber).props')"
|
||||
Project="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\build\Microsoft.GDK.PC.$(GDKEditionNumber).props" />
|
||||
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props')"
|
||||
Project="$(ExtractedFolder)GDK\$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props" />
|
||||
|
||||
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64'))"
|
||||
Project="$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)\build\Microsoft.GDK.Xbox.$(GDKEditionNumber).props" />
|
||||
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props')"
|
||||
Project="$(ExtractedFolder)GDK\$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props" />
|
||||
|
||||
<!-- Remove copy of real gameos.xvd since this is a build validation only pipeline -->
|
||||
<PropertyGroup Condition="'$(Platform)' == 'Gaming.Xbox.XboxOne.x64' or '$(Platform)' == 'Gaming.Xbox.Scarlett.x64'">
|
||||
<GameOSFilePath>$(MSBuildThisFileDirectory)build\placeholder.xvd</GameOSFilePath>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
****************************************************************************************************
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
This file is a placeholder for gameos.xvd to speed up ADO pipeline builds.
|
Загрузка…
Ссылка в новой задаче