diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bd4f2bbaa48..21c080b1367 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,7 +73,7 @@ stages: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre + demands: Build.Windows.Amd64.VS2022.Pre # runAsPublic is used in expressions, which can't read from user-defined variables runAsPublic: false diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props index 1db2f681448..f0fedfd0830 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props @@ -3,8 +3,8 @@ 15.0 Unicode - - v142 + + v143 10.0.19041.0 diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 5c91fcadede..5f9762ebf9d 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -35,10 +35,10 @@ jobs: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre variables: # needed for signing - name: _TeamName diff --git a/global.json b/global.json index 5c90919eb6a..5d64e11eac9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.1.21430.12", + "dotnet": "6.0.100", "runtimes": { "dotnet": [ "2.1.7", @@ -16,7 +16,7 @@ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2" }, "sdk": { - "version": "6.0.100-rc.1.21430.12" + "version": "6.0.100" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", diff --git a/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj b/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj index d465def4d27..0a25fc5be59 100644 --- a/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj +++ b/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj @@ -33,8 +33,8 @@ - Microsoft.VC142.CRT - Microsoft.VC142.DebugCRT + Microsoft.VC143.CRT + Microsoft.VC143.DebugCRT @@ -71,4 +71,4 @@ Win32Proj - \ No newline at end of file +