Skip to content

Commit e9c0e13

Browse files
committed
[8.0.3xx] Distribute MSBuild 17.10.29
Bumps to the patched MSBuild version matching this SDK band and pins F# to the same version.
1 parent 4722454 commit e9c0e13

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

NuGet.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7/nuget/v3/index.json" />
1616
<!-- End: Package sources from dotnet-aspnetcore -->
1717
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
18-
<add key="darc-pub-DotNet-msbuild-Trusted-323d4b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-323d4b37/nuget/v3/index.json" />
18+
<add key="darc-int-DotNet-msbuild-Trusted-27f9d42" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-27f9d42f/nuget/v3/index.json" />
1919
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2020
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2121
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -54,6 +54,10 @@
5454
<!-- End: Package sources from dotnet-templating -->
5555
<!-- Begin: Package sources from dotnet-aspnetcore -->
5656
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="true" />
57+
<!-- End: Package sources from dotnet-aspnetcore -->
58+
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
59+
<add key="darc-int-DotNet-msbuild-Trusted-27f9d42" value="true" />
60+
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5761
<!-- Begin: Package sources from dotnet-emsdk -->
5862
<!-- End: Package sources from dotnet-emsdk -->
5963
<!-- Begin: Package sources from dotnet-format -->

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>2b0cca8ad3a88e02fe0878139009ffffde071f1f</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.27">
59-
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>323d4b37f1b3282f1cfbf6f0977aa8044d1b9020</Sha>
58+
<Dependency Name="Microsoft.Build" Version="17.10.29">
59+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
60+
<Sha>27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.27-servicing-25215-02">
63-
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>323d4b37f1b3282f1cfbf6f0977aa8044d1b9020</Sha>
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.29-servicing-25223-08">
63+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
64+
<Sha>27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.27-servicing-25215-02">
67-
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>323d4b37f1b3282f1cfbf6f0977aa8044d1b9020</Sha>
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.29-servicing-25223-08">
67+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
68+
<Sha>27f9d42f6ea83c5aa7dddcab38a17806bfa50bc3</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,16 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.10.27</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.10.29</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
131131
132132
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
133-
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
133+
<MicrosoftBuildPackageVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.29</MicrosoftBuildPackageVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.10.27-servicing-25215-02</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.10.29-servicing-25223-08</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

src/Layout/tool_fsharp/tool_fsc.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
10-
<PackageReference Include="Microsoft.Build.Framework" />
11-
<PackageReference Include="Microsoft.Build.Tasks.Core" />
12-
<PackageReference Include="Microsoft.Build.Utilities.Core" />
10+
<PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
11+
<PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
12+
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
13+
<PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
1314
</ItemGroup>
1415

1516
<Target Name="_ResolvePublishNuGetPackagePdbsAndXml"

0 commit comments

Comments
 (0)