Skip to content

Commit 1fb6d09

Browse files
akoeplingerakoeplinger
authored
Revert msbuild again and move properties to the correct sections in Versions.props/V.D.xml
1 parent ff95f2d commit 1fb6d09

File tree

2 files changed

+55
-53
lines changed

2 files changed

+55
-53
lines changed

‎eng/Version.Details.xml‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,20 @@
332332
<Uri>https://github.com/dotnet/dotnet</Uri>
333333
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
334334
</Dependency>
335-
<!-- Not updated automatically -->
335+
<Dependency Name="System.Composition" Version="10.0.0-preview.7.25366.103">
336+
<Uri>https://github.com/dotnet/dotnet</Uri>
337+
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
338+
</Dependency>
339+
<Dependency Name="Microsoft.DotNet.HotReload.Agent" Version="10.0.100-preview.7.25366.103">
340+
<Uri>https://github.com/dotnet/dotnet</Uri>
341+
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
342+
</Dependency>
343+
<Dependency Name="Microsoft.DotNet.HotReload.Agent.Data" Version="10.0.100-preview.7.25366.103">
344+
<Uri>https://github.com/dotnet/dotnet</Uri>
345+
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
346+
</Dependency>
347+
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
348+
<!-- These versions are manually updated -->
336349
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-3.24613.7">
337350
<Uri>https://github.com/dotnet/roslyn</Uri>
338351
<Sha>afdd413cee50c16318620252e4e64dc326e2d300</Sha>
@@ -349,18 +362,7 @@
349362
<Uri>https://github.com/dotnet/roslyn</Uri>
350363
<Sha>afdd413cee50c16318620252e4e64dc326e2d300</Sha>
351364
</Dependency>
352-
<Dependency Name="System.Composition" Version="10.0.0-preview.7.25366.103">
353-
<Uri>https://github.com/dotnet/dotnet</Uri>
354-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
355-
</Dependency>
356-
<Dependency Name="Microsoft.DotNet.HotReload.Agent" Version="10.0.100-preview.7.25366.103">
357-
<Uri>https://github.com/dotnet/dotnet</Uri>
358-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
359-
</Dependency>
360-
<Dependency Name="Microsoft.DotNet.HotReload.Agent.Data" Version="10.0.100-preview.7.25366.103">
361-
<Uri>https://github.com/dotnet/dotnet</Uri>
362-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
363-
</Dependency>
365+
<!-- End of manually updated dependencies -->
364366
</ProductDependencies>
365367
<ToolsetDependencies>
366368
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
@@ -408,18 +410,6 @@
408410
<Uri>https://github.com/dotnet/extensions</Uri>
409411
<Sha>cc0d010d068ddab0c5951b6cfc5793d379c0532c</Sha>
410412
</Dependency>
411-
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
412-
<Uri>https://github.com/nuget/nuget.client</Uri>
413-
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
414-
</Dependency>
415-
<Dependency Name="NuGet.Packaging" Version="6.2.4">
416-
<Uri>https://github.com/nuget/nuget.client</Uri>
417-
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
418-
</Dependency>
419-
<Dependency Name="NuGet.Versioning" Version="6.2.4">
420-
<Uri>https://github.com/nuget/nuget.client</Uri>
421-
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
422-
</Dependency>
423413
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25363.1">
424414
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
425415
<Sha>54bab2dbb7652269d9ae0758de122f933b254561</Sha>
@@ -441,21 +431,35 @@
441431
<Sha>54bab2dbb7652269d9ae0758de122f933b254561</Sha>
442432
</Dependency>
443433
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
444-
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25366-103">
445-
<Uri>https://github.com/dotnet/dotnet</Uri>
446-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
434+
<!-- These versions are manually updated -->
435+
<Dependency Name="Microsoft.Build" Version="17.12.36">
436+
<Uri>https://github.com/dotnet/msbuild</Uri>
437+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
447438
</Dependency>
448-
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25366-103">
449-
<Uri>https://github.com/dotnet/dotnet</Uri>
450-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
439+
<Dependency Name="Microsoft.Build.Framework" Version="17.12.36">
440+
<Uri>https://github.com/dotnet/msbuild</Uri>
441+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
451442
</Dependency>
452-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25366-103">
453-
<Uri>https://github.com/dotnet/dotnet</Uri>
454-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
443+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.12.36">
444+
<Uri>https://github.com/dotnet/msbuild</Uri>
445+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
455446
</Dependency>
456-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25366-103">
457-
<Uri>https://github.com/dotnet/dotnet</Uri>
458-
<Sha>d13c858f5792ca573c322dcaf2cf7ea814fa5f31</Sha>
447+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.12.36">
448+
<Uri>https://github.com/dotnet/msbuild</Uri>
449+
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
450+
</Dependency>
451+
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
452+
<Uri>https://github.com/nuget/nuget.client</Uri>
453+
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
454+
</Dependency>
455+
<Dependency Name="NuGet.Packaging" Version="6.2.4">
456+
<Uri>https://github.com/nuget/nuget.client</Uri>
457+
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
458+
</Dependency>
459+
<Dependency Name="NuGet.Versioning" Version="6.2.4">
460+
<Uri>https://github.com/nuget/nuget.client</Uri>
461+
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
459462
</Dependency>
463+
<!-- End of manually updated dependencies -->
460464
</ToolsetDependencies>
461465
</Dependencies>

‎eng/Versions.props‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,9 @@
155155
<MicrosoftEntityFrameworkCoreToolsVersion>10.0.0-preview.7.25366.103</MicrosoftEntityFrameworkCoreToolsVersion>
156156
<MicrosoftEntityFrameworkCoreVersion>10.0.0-preview.7.25366.103</MicrosoftEntityFrameworkCoreVersion>
157157
<MicrosoftEntityFrameworkCoreDesignVersion>10.0.0-preview.7.25366.103</MicrosoftEntityFrameworkCoreDesignVersion>
158-
<!-- Packages from dotnet/msbuild -->
159-
<MicrosoftBuildVersion>17.15.0-preview-25366-103</MicrosoftBuildVersion>
160-
<MicrosoftBuildFrameworkVersion>17.15.0-preview-25366-103</MicrosoftBuildFrameworkVersion>
161-
<MicrosoftBuildTasksCoreVersion>17.15.0-preview-25366-103</MicrosoftBuildTasksCoreVersion>
162-
<MicrosoftBuildUtilitiesCoreVersion>17.15.0-preview-25366-103</MicrosoftBuildUtilitiesCoreVersion>
163158
<!-- Packages from dotnet/sdk -->
164159
<MicrosoftDotNetHotReloadAgentVersion>10.0.100-preview.7.25366.103</MicrosoftDotNetHotReloadAgentVersion>
165160
<MicrosoftDotNetHotReloadAgentDataVersion>10.0.100-preview.7.25366.103</MicrosoftDotNetHotReloadAgentDataVersion>
166-
<!-- Packages from dotnet/roslyn -->
167-
<!-- Not updated automatically -->
168-
<MicrosoftCodeAnalysisCommonVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCommonVersion>
169-
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
170-
<MicrosoftCodeAnalysisCSharpVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpVersion>
171-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
172-
<!-- Packages from NuGet/Nuget.client -->
173-
<!-- If you update these versions, make sure to also update https://github.com/dotnet/aspnetcore/blob/main/eng/SourceBuildPrebuiltBaseline.xml -->
174-
<NuGetPackagingVersion>6.2.4</NuGetPackagingVersion>
175-
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
176-
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
177161
<!-- Packages from dotnet/arcade -->
178162
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25366.103</MicrosoftDotNetBuildTasksArchivesVersion>
179163
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25366.103</MicrosoftDotNetBuildTasksInstallersVersion>
@@ -229,6 +213,11 @@
229213
<!-- Partner teams -->
230214
<MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
231215
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
216+
<!-- Packages from dotnet/msbuild -->
217+
<MicrosoftBuildVersion>17.12.36</MicrosoftBuildVersion>
218+
<MicrosoftBuildFrameworkVersion>17.12.36</MicrosoftBuildFrameworkVersion>
219+
<MicrosoftBuildTasksCoreVersion>17.12.36</MicrosoftBuildTasksCoreVersion>
220+
<MicrosoftBuildUtilitiesCoreVersion>17.12.36</MicrosoftBuildUtilitiesCoreVersion>
232221
<!--
233222
Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test
234223
framework in current .NET SDKs.
@@ -240,6 +229,11 @@
240229
preview or stable versions are released to NuGet.org.
241230
-->
242231
<MicrosoftTemplateEngineAuthoringTasksVersion>8.0.100-alpha.1.22607.1</MicrosoftTemplateEngineAuthoringTasksVersion>
232+
<!-- Packages from dotnet/roslyn -->
233+
<MicrosoftCodeAnalysisCommonVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCommonVersion>
234+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
235+
<MicrosoftCodeAnalysisCSharpVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpVersion>
236+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
243237
<!--
244238
Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK.
245239
This need to be pinned since they're used in 3.1 apps and need to be loadable in VS 2019.
@@ -278,6 +272,10 @@
278272
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>9.0.0-rtm-24529-3</MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>
279273
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>
280274
<MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>
275+
<!-- Packages from NuGet/Nuget.client -->
276+
<NuGetPackagingVersion>6.2.4</NuGetPackagingVersion>
277+
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
278+
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
281279
<!-- 3rd party dependencies -->
282280
<AzureIdentityVersion>1.11.4</AzureIdentityVersion>
283281
<AngleSharpVersion>0.9.9</AngleSharpVersion>

0 commit comments

Comments
 (0)