Skip to content

Commit e34d439

Browse files
author
Mirroring
committed
Merge commit '86df84c2d7af94e566511f0f5fd4781f534c824d'
2 parents 259e4d0 + 86df84c commit e34d439

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

NuGet.config

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88
<!-- End: Package sources from dotnet-emsdk -->
99
<!-- Begin: Package sources from dotnet-format -->
1010
<add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-format-c7e5d39-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-4/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-format-c7e5d39-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-3/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-format-c7e5d39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-2/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-format-c7e5d39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-1/nuget/v3/index.json" />
1115
<!-- End: Package sources from dotnet-format -->
1216
<!-- Begin: Package sources from dotnet-aspnetcore -->
1317
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61/nuget/v3/index.json" />
1418
<!-- End: Package sources from dotnet-aspnetcore -->
1519
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
16-
<add key="darc-pub-DotNet-msbuild-Trusted-bb7294f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bb7294f7-1/nuget/v3/index.json" />
20+
<add key="darc-pub-DotNet-msbuild-Trusted-dbc02fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-dbc02fd5/nuget/v3/index.json" />
1721
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1822
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1923
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -22,6 +26,10 @@
2226
<!-- End: Package sources from dotnet-runtime -->
2327
<!-- Begin: Package sources from dotnet-templating -->
2428
<add key="darc-pub-dotnet-templating-7994f94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-7994f94-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-4/nuget/v3/index.json" />
30+
<add key="darc-pub-dotnet-templating-7994f94-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-3/nuget/v3/index.json" />
31+
<add key="darc-pub-dotnet-templating-7994f94-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-2/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-7994f94-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7994f94e-1/nuget/v3/index.json" />
2533
<!-- End: Package sources from dotnet-templating -->
2634
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2735
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a3ad74/nuget/v3/index.json" />

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>976b101e5539557c20e2ac39885ac879531bcf82</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.32">
58+
<Dependency Name="Microsoft.Build" Version="17.10.33">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
60+
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.32-servicing-25313-10">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.33-servicing-25353-02">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
64+
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.32-servicing-25313-10">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.33-servicing-25353-02">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>bb7294f72e2779834a7898b8d7f1d8c54eac9845</Sha>
68+
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.10.32</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.10.33</MicrosoftBuildPackageVersion>
130130
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
131131
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
132132
so target one that matches the version in minimumMSBuildVersion.
@@ -135,7 +135,7 @@
135135
<MicrosoftBuildPackageVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.29</MicrosoftBuildPackageVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.10.32-servicing-25313-10</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.10.33-servicing-25353-02</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)