Skip to content

Commit a9d6fde

Browse files
hoyosjshoyosjs
authored
Revert "[release/8.0] Bump STJ and MSBuild Version" (#121123) (#121126)
Reverts #119859 VS17.10 can't support 8.0.5 and as a result this change needs to be backed out.
1 parent efd48bd commit a9d6fde

File tree

3 files changed

+28
-32
lines changed

3 files changed

+28
-32
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -293,38 +293,34 @@
293293
<Uri>https://github.com/dotnet/llvm-project</Uri>
294294
<Sha>0a471ebbe6a4a9c095169dd531b825a4370f57f3</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.10">
296+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23406.6">
297297
<Uri>https://github.com/dotnet/runtime</Uri>
298-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
298+
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
299299
</Dependency>
300300
<Dependency Name="runtime.native.System.IO.Ports" Version="8.0.0-rc.1.23406.6">
301301
<Uri>https://github.com/dotnet/runtime</Uri>
302302
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
303303
</Dependency>
304-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.10-servicing.24466.9">
305-
<Uri>https://github.com/dotnet/runtime</Uri>
306-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
307-
</Dependency>
308-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.10-servicing.24466.9">
304+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-rc.1.23406.6">
309305
<Uri>https://github.com/dotnet/runtime</Uri>
310-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
306+
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
311307
</Dependency>
312-
<Dependency Name="System.Text.Json" Version="8.0.5">
308+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-rc.1.23406.6">
313309
<Uri>https://github.com/dotnet/runtime</Uri>
314-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
310+
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
315311
</Dependency>
316-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime" Version="8.0.10-servicing.24466.9">
312+
<Dependency Name="System.Text.Json" Version="8.0.0-rc.1.23406.6">
317313
<Uri>https://github.com/dotnet/runtime</Uri>
318-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
314+
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
319315
<SourceBuild RepoName="runtime" ManagedOnly="false" />
320316
</Dependency>
321-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.10">
317+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23406.6">
322318
<Uri>https://github.com/dotnet/runtime</Uri>
323-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
319+
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324320
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.10">
321+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23406.6">
326322
<Uri>https://github.com/dotnet/runtime</Uri>
327-
<Sha>b5f53494d6541a1ef9b7d0e13214d5e5e5cec594</Sha>
323+
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
328324
</Dependency>
329325
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.25427.2">
330326
<Uri>https://github.com/dotnet/xharness</Uri>
@@ -414,13 +410,13 @@
414410
<Uri>https://github.com/dotnet/installer</Uri>
415411
<Sha>46a7370763921ded24dcb70c585ee97883c615d4</Sha>
416412
</Dependency>
417-
<Dependency Name="Microsoft.Build" Version="17.8.43">
413+
<Dependency Name="Microsoft.Build" Version="17.8.3">
418414
<Uri>https://github.com/dotnet/msbuild</Uri>
419-
<Sha>f0cbb13971c30ad15a3f252a8d0171898a01ec11</Sha>
415+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
420416
</Dependency>
421-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.43-servicing-25466-03">
417+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
422418
<Uri>https://github.com/dotnet/msbuild</Uri>
423-
<Sha>f0cbb13971c30ad15a3f252a8d0171898a01ec11</Sha>
419+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
424420
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
425421
</Dependency>
426422
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
108-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
108+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rc.1.23406.6</MicrosoftNETCoreAppRuntimewinx64Version>
109109
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
110110
<!-- CoreClr dependencies -->
111-
<MicrosoftNETCoreILAsmVersion>8.0.10-servicing.24466.9</MicrosoftNETCoreILAsmVersion>
111+
<MicrosoftNETCoreILAsmVersion>8.0.0-rc.1.23406.6</MicrosoftNETCoreILAsmVersion>
112112
<MicrosoftNETCoreILAsmVersion>8.0.0-preview.7.23325.2</MicrosoftNETCoreILAsmVersion>
113113
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.25311.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
114114
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.25311.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
@@ -137,16 +137,16 @@
137137
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
138138
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
139139
<!-- The following package versions are present in minimum MSBuild / VS version that this release is supported on -->
140-
<MicrosoftBclAsyncInterfacesToolsetVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
140+
<MicrosoftBclAsyncInterfacesToolsetVersion>7.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
141141
<SystemBuffersToolsetVersion>4.5.1</SystemBuffersToolsetVersion>
142-
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
142+
<SystemCollectionsImmutableToolsetVersion>7.0.0</SystemCollectionsImmutableToolsetVersion>
143143
<SystemMemoryToolsetVersion>4.5.5</SystemMemoryToolsetVersion>
144144
<SystemReflectionMetadataLoadContextToolsetVersion>7.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
145-
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
146-
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
147-
<SystemTextJsonToolsetVersion>8.0.5</SystemTextJsonToolsetVersion>
145+
<SystemReflectionMetadataToolsetVersion>7.0.0</SystemReflectionMetadataToolsetVersion>
146+
<SystemTextEncodingsWebToolsetVersion>7.0.0</SystemTextEncodingsWebToolsetVersion>
147+
<SystemTextJsonToolsetVersion>7.0.3</SystemTextJsonToolsetVersion>
148148
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
149-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
149+
<SystemTextJsonVersion>8.0.0-rc.1.23406.6</SystemTextJsonVersion>
150150
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
151151
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
152152
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
@@ -182,7 +182,7 @@
182182
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
183183
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
184184
<DNNEVersion>2.0.5</DNNEVersion>
185-
<MicrosoftBuildVersion>17.8.43</MicrosoftBuildVersion>
185+
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
186186
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
187187
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
188188
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
@@ -223,11 +223,11 @@
223223
<!-- Docs -->
224224
<MicrosoftPrivateIntellisenseVersion>8.0.0-preview-20230918.1</MicrosoftPrivateIntellisenseVersion>
225225
<!-- ILLink -->
226-
<MicrosoftNETILLinkTasksVersion>8.0.10</MicrosoftNETILLinkTasksVersion>
226+
<MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23406.6</MicrosoftNETILLinkTasksVersion>
227227
<!-- Mono Cecil -->
228228
<MicrosoftDotNetCecilVersion>0.11.4-alpha.25515.1</MicrosoftDotNetCecilVersion>
229229
<!-- ILCompiler -->
230-
<MicrosoftDotNetILCompilerVersion>8.0.10</MicrosoftDotNetILCompilerVersion>
230+
<MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23406.6</MicrosoftDotNetILCompilerVersion>
231231
<!-- ICU -->
232232
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25504.1</MicrosoftNETCoreRuntimeICUTransportVersion>
233233
<!-- MsQuic -->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25515.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
16-
"Microsoft.NET.Sdk.IL": "8.0.10-servicing.24466.9"
16+
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
1717
}
1818
}

0 commit comments

Comments
 (0)