Skip to content

Commit b96bc2b

Browse files
PranavSenthilnathanPranavSenthilnathan
authored
[automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#120861)
I detected changes in the release/9.0 branch which have not been merged yet to release/9.0-staging. I'm a robot and am configured to help you automatically keep release/9.0-staging up to date, so I've opened this PR. This PR merges commits made on release/9.0 by the following committers: * PranavSenthilnathan * dotnet-maestro[bot] ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout release/9.0 git pull --ff-only git checkout release/9.0-staging git pull --ff-only git merge --no-ff release/9.0 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-to-release/9.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging git pull https://github.com/dotnet/runtime merge/release/9.0-to-release/9.0-staging (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging git pull [email protected]:dotnet/runtime merge/release/9.0-to-release/9.0-staging (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
2 parents 1d264f7 + 8af0613 commit b96bc2b

File tree

4 files changed

+74
-74
lines changed

4 files changed

+74
-74
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-45d453f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-45d453fc/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-b65413a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b65413ac/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
1515
<!-- End: Package sources from dotnet-sdk -->

‎eng/Version.Details.xml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,24 @@
6464
<Sha>805b6bcdc748e5b63ea01c05e70432b615db1b04</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
67-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.11-servicing.25509.4">
67+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.11-servicing.25516.4">
6868
<Uri>https://github.com/dotnet/emsdk</Uri>
69-
<Sha>45d453fc255d05e4358671ad3ba8ddea7e978773</Sha>
69+
<Sha>b65413ac057eb0a54c51b76b1855bc377c2132c3</Sha>
7070
</Dependency>
7171
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.11">
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
73-
<Sha>45d453fc255d05e4358671ad3ba8ddea7e978773</Sha>
73+
<Sha>b65413ac057eb0a54c51b76b1855bc377c2132c3</Sha>
7474
</Dependency>
7575
<!-- Intermediate is necessary for source build. -->
76-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.11-servicing.25509.4">
76+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.11-servicing.25516.4">
7777
<Uri>https://github.com/dotnet/emsdk</Uri>
78-
<Sha>45d453fc255d05e4358671ad3ba8ddea7e978773</Sha>
78+
<Sha>b65413ac057eb0a54c51b76b1855bc377c2132c3</Sha>
7979
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
8080
</Dependency>
8181
<!-- Intermediate is necessary for source build. -->
82-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25506.2">
82+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25517.3">
8383
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
84-
<Sha>5511a69718e9d581386105705152592cee268e37</Sha>
84+
<Sha>2621104ca7f734b64166a4eb3cf4927166b82da9</Sha>
8585
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
8686
</Dependency>
8787
<!-- Intermediate is necessary for source build. -->
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25503.3">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
97+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25503.3">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25515.2">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
102+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25503.3">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25515.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
107+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25503.3">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
111+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25503.3">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25515.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
115+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25503.3">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25515.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
119+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25503.3">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25515.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
123+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25503.3">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25515.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
127+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25503.3">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25515.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
131+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25503.3">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25515.2">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
135+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25503.3">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25515.2">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
139+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25503.3">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25515.2">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
143+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25503.3">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25515.2">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
147+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25503.3">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25515.2">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
151+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25503.3">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25515.2">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
155+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25503.3">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25515.2">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
159+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25503.3">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25515.2">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
163+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25503.3">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25515.2">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
167+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25503.3">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25515.2">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
171+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25503.3">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25515.2">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
175+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25516.2">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -332,9 +332,9 @@
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333333
<Sha>47324ca7227e3b6e9f51b85b3e1a4a425e89a0ae</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25503.3">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25515.2">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
337+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>9.0.109</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25503.3</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25503.3</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25503.3</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25503.3</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25503.3</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25503.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25503.3</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25503.3</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25503.3</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25515.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25515.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25515.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25515.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25515.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25515.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25515.2</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25515.2</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25515.2</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
@@ -177,7 +177,7 @@
177177
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
178178
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
179179
<DNNEVersion>2.0.5</DNNEVersion>
180-
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
180+
<MicrosoftBuildVersion>17.8.43</MicrosoftBuildVersion>
181181
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
182182
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
183183
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
@@ -250,7 +250,7 @@
250250
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
251251
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
252252
-->
253-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.11-servicing.25509.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
253+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.11-servicing.25516.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
254254
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.11</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
255255
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version)</MicrosoftNETRuntimeEmscriptenVersion>
256256
<!-- workloads -->
@@ -270,7 +270,7 @@
270270
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
271271
<!-- sdk version, for testing workloads -->
272272
<!-- <SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting> -->
273-
<SdkVersionForWorkloadTesting>9.0.110</SdkVersionForWorkloadTesting>
273+
<SdkVersionForWorkloadTesting>9.0.111</SdkVersionForWorkloadTesting>
274274
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
275275
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
276276
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "9.0.110",
3+
"version": "9.0.111",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "9.0.110"
8+
"dotnet": "9.0.111"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25503.3",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25503.3",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25515.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"

0 commit comments

Comments
 (0)