Update global.json to use latest (#3880)

This commit is contained in:
Bob Pulliam 2023-09-26 18:36:46 -04:00 коммит произвёл GitHub
Родитель 485d1db876
Коммит 49997a7731
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 5 добавлений и 10 удалений

Просмотреть файл

@ -4,15 +4,10 @@ parameters:
default: True default: True
steps: steps:
- task: UseDotNet@2
displayName: Use .NET Core SDK 5
inputs:
version: 5.0.407
- task: UseDotNet@2 - task: UseDotNet@2
displayName: Use .NET Core SDK 6 displayName: Use .NET Core SDK 6
inputs: inputs:
version: 6.0.401 version: 6.0.414
# Extract the build revision number from Build.BuildNumber. This is needed to pass to build-nupkg. # Extract the build revision number from Build.BuildNumber. This is needed to pass to build-nupkg.
# This relies on the format of the pipeline name being of the format: $(date:yyMM).$(date:dd)$(rev:rrr) # This relies on the format of the pipeline name being of the format: $(date:yyMM).$(date:dd)$(rev:rrr)

Просмотреть файл

@ -45,11 +45,11 @@
<Uri>https://github.com/microsoft/CsWinRT</Uri> <Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha>fa7f5565cb53353dc15c28a09ebd500577dc0b72</Sha> <Sha>fa7f5565cb53353dc15c28a09ebd500577dc0b72</Sha>
</Dependency> </Dependency>
<Dependency Name="CsWinRT.Dependency.DotNetCoreSdk" Version="6.0.412"> <Dependency Name="CsWinRT.Dependency.DotNetCoreSdk" Version="6.0.414">
<Uri>https://github.com/microsoft/CsWinRT</Uri> <Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha>fa7f5565cb53353dc15c28a09ebd500577dc0b72</Sha> <Sha>fa7f5565cb53353dc15c28a09ebd500577dc0b72</Sha>
</Dependency> </Dependency>
<Dependency Name="CsWinRT.Dependency.DotNetCoreRuntime" Version="6.0.20"> <Dependency Name="CsWinRT.Dependency.DotNetCoreRuntime" Version="6.0.22">
<Uri>https://github.com/microsoft/CsWinRT</Uri> <Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha>fa7f5565cb53353dc15c28a09ebd500577dc0b72</Sha> <Sha>fa7f5565cb53353dc15c28a09ebd500577dc0b72</Sha>
</Dependency> </Dependency>

Просмотреть файл

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "6.0.406" "dotnet": "6.0.414"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.WinAppSDK.EngCommon": "1.5.230711" "Microsoft.WinAppSDK.EngCommon": "1.5.230711"

Просмотреть файл

@ -58,7 +58,7 @@ namespace WindowsAppRuntimeInstaller
HRESULT AddPackage( HRESULT AddPackage(
WindowsAppRuntimeInstaller::InstallActivity::Context& installActivityContext, WindowsAppRuntimeInstaller::InstallActivity::Context& installActivityContext,
const Uri& packageUri, const Uri& packageUri,
const std::unique_ptr<PackageProperties>& packageProperties, const std::unique_ptr<PackageProperties>&,
bool forceDeployment) bool forceDeployment)
{ {
const auto deploymentOptions{ forceDeployment ? const auto deploymentOptions{ forceDeployment ?