diff --git a/NuGet.config b/NuGet.config index af89298b2..70d2ba891 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 168319dc9..93e47eb73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/dotnet - 17d11de66cf75b962995c81dd1235fae9aa5ece0 + be8731b57bc95bab2c4ae142710f347d2c5bc243 - + https://github.com/dotnet/dotnet - 17d11de66cf75b962995c81dd1235fae9aa5ece0 + be8731b57bc95bab2c4ae142710f347d2c5bc243 https://github.com/dotnet/android @@ -34,11 +34,15 @@ https://github.com/dotnet/maui 8151668ee5299645694a934cc0f706d403bd64b0 + + https://github.com/dotnet/dotnet + be8731b57bc95bab2c4ae142710f347d2c5bc243 + - + https://github.com/dotnet/dotnet - 17d11de66cf75b962995c81dd1235fae9aa5ece0 + be8731b57bc95bab2c4ae142710f347d2c5bc243 diff --git a/eng/Versions.props b/eng/Versions.props index 67e44b21d..814dd6faf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 11.0.100-preview.2.26159.112 + 11.0.100-preview.2.final $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion) 11.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -60,7 +60,9 @@ $(MicrosoftNETSdktvOSManifest110100preview2PackageVersion) - 11.0.100-preview.2.26159.112 + 11.0.0-preview.2.final + 11.0.100-preview.2.26162.103 + $(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview2PackageVersion) 11.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 76a54e157..4f4b56ed2 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -73,7 +73,7 @@ steps: # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, # we can avoid including the MB install step if not enabled at all. This avoids a bunch of # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - - template: /eng/common/core-templates/steps/install-microbuild-impl.yml + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self parameters: enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} microbuildTaskInputs: @@ -95,7 +95,7 @@ steps: condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: - - template: /eng/common/core-templates/steps/install-microbuild-impl.yml + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self parameters: enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} microbuildTaskInputs: diff --git a/global.json b/global.json index 5c55fad27..90169d49f 100644 --- a/global.json +++ b/global.json @@ -9,7 +9,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26159.112", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26162.103", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } }