Skip to content

Commit eccc5f9

Browse files
author
Mirroring
committed
Merge commit 'dac48c6ffbdd2ca1b3b306354030ffcf58f5270c'
2 parents eb8b410 + dac48c6 commit eccc5f9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-aspnetcore -->
2424
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
25-
<add key="darc-pub-DotNet-msbuild-Trusted-e4f5b93" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e4f5b938/nuget/v3/index.json" />
25+
<add key="darc-pub-DotNet-msbuild-Trusted-17752ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-17752ceb/nuget/v3/index.json" />
2626
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2727
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2828
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.19">
58+
<Dependency Name="Microsoft.Build" Version="17.11.22">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>e4f5b938613ae9d306a0396f1d6186a19c970b93</Sha>
60+
<Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.19-servicing-24603-10">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.22-servicing-25065-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>e4f5b938613ae9d306a0396f1d6186a19c970b93</Sha>
64+
<Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.19-servicing-24603-10">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.22-servicing-25065-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>e4f5b938613ae9d306a0396f1d6186a19c970b93</Sha>
68+
<Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.11.19</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.11.22</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.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.11.19-servicing-24603-10</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.11.22-servicing-25065-03</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)