Skip to content

Commit fe9d439

Browse files
committed
Merge in 'release/7.0.1xx' changes
2 parents 54a9b90 + 5f02c0c commit fe9d439

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<add key="darc-int-dotnet-aspnetcore-432e6a0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-432e6a06-1/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-aspnetcore -->
1212
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
13+
<add key="darc-pub-DotNet-msbuild-Trusted-9a89d02" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9a89d02f/nuget/v3/index.json" />
1314
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1415
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1516
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5151
<Sha>b183393058491bf0140928107de9ce814b69d53d</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.Build" Version="17.4.0">
53+
<Dependency Name="Microsoft.Build" Version="17.4.1">
5454
<Uri>https://github.com/dotnet/msbuild</Uri>
55-
<Sha>18d5aef85920037c9d6ff49b1215a4daf515197f</Sha>
55+
<Sha>9a89d02ff5de19d84190ebed4a6017df4dc19dc4</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.Build.Localization" Version="17.4.0-preview-22518-02">
57+
<Dependency Name="Microsoft.Build.Localization" Version="17.4.1-preview-22601-06">
5858
<Uri>https://github.com/dotnet/msbuild</Uri>
59-
<Sha>18d5aef85920037c9d6ff49b1215a4daf515197f</Sha>
59+
<Sha>9a89d02ff5de19d84190ebed4a6017df4dc19dc4</Sha>
6060
</Dependency>
6161
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5">
6262
<Uri>https://github.com/dotnet/fsharp</Uri>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</PropertyGroup>
107107
<PropertyGroup>
108108
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
109-
<MicrosoftBuildPackageVersion>17.4.0</MicrosoftBuildPackageVersion>
109+
<MicrosoftBuildPackageVersion>17.4.1</MicrosoftBuildPackageVersion>
110110
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
111111
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
112112
so target one that matches the version in minimumMSBuildVersion.
@@ -115,7 +115,7 @@
115115
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
116116
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
117117
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
118-
<MicrosoftBuildLocalizationPackageVersion>17.4.0-preview-22518-02</MicrosoftBuildLocalizationPackageVersion>
118+
<MicrosoftBuildLocalizationPackageVersion>17.4.1-preview-22601-06</MicrosoftBuildLocalizationPackageVersion>
119119
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
120120
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
121121
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>

0 commit comments

Comments
 (0)