From 49997a77315da969b1a4f2a9a1594f253f5e4836 Mon Sep 17 00:00:00 2001 From: Bob Pulliam Date: Tue, 26 Sep 2023 18:36:46 -0400 Subject: [PATCH] Update global.json to use latest (#3880) --- .../WindowsAppSDK-SetupBuildEnvironment-Steps.yml | 7 +------ eng/Version.Details.xml | 4 ++-- global.json | 2 +- installer/dev/install.cpp | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml index 7f7f78ae7..e91f72239 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml @@ -4,15 +4,10 @@ parameters: default: True steps: -- task: UseDotNet@2 - displayName: Use .NET Core SDK 5 - inputs: - version: 5.0.407 - - task: UseDotNet@2 displayName: Use .NET Core SDK 6 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. # This relies on the format of the pipeline name being of the format: $(date:yyMM).$(date:dd)$(rev:rrr) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80444eb05..697703106 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,11 +45,11 @@ https://github.com/microsoft/CsWinRT fa7f5565cb53353dc15c28a09ebd500577dc0b72 - + https://github.com/microsoft/CsWinRT fa7f5565cb53353dc15c28a09ebd500577dc0b72 - + https://github.com/microsoft/CsWinRT fa7f5565cb53353dc15c28a09ebd500577dc0b72 diff --git a/global.json b/global.json index 3b5541eb8..5f61a9c04 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.406" + "dotnet": "6.0.414" }, "msbuild-sdks": { "Microsoft.WinAppSDK.EngCommon": "1.5.230711" diff --git a/installer/dev/install.cpp b/installer/dev/install.cpp index 3959bdf5b..6f2ab7555 100644 --- a/installer/dev/install.cpp +++ b/installer/dev/install.cpp @@ -58,7 +58,7 @@ namespace WindowsAppRuntimeInstaller HRESULT AddPackage( WindowsAppRuntimeInstaller::InstallActivity::Context& installActivityContext, const Uri& packageUri, - const std::unique_ptr& packageProperties, + const std::unique_ptr&, bool forceDeployment) { const auto deploymentOptions{ forceDeployment ?