Skip to content

Commit 40fb17e

Browse files
authored
Merge branch 'release/8.0.3xx' into darc-release/8.0.3xx-37f0997d-65dd-4184-9354-9b402bb6dcf9
2 parents fde77f9 + 34a5f8c commit 40fb17e

File tree

3 files changed

+9
-31
lines changed

3 files changed

+9
-31
lines changed

NuGet.config

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
7-
<add key="darc-pub-dotnet-emsdk-6fd14a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-emsdk-6fd14a4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-3/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-emsdk-6fd14a4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-2/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-emsdk-6fd14a4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-1/nuget/v3/index.json" />
117
<!-- End: Package sources from dotnet-emsdk -->
128
<!-- Begin: Package sources from dotnet-format -->
139
<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" />
@@ -17,27 +13,18 @@
1713
<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" />
1814
<!-- End: Package sources from dotnet-format -->
1915
<!-- Begin: Package sources from dotnet-aspnetcore -->
20-
<add key="darc-int-dotnet-aspnetcore-277e317" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-aspnetcore-277e317-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-2/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-1/nuget/v3/index.json" />
2316
<!-- End: Package sources from dotnet-aspnetcore -->
2417
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
25-
<add key="darc-pub-DotNet-msbuild-Trusted-da89d7e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-da89d7e7/nuget/v3/index.json" />
18+
<add key="darc-pub-DotNet-msbuild-Trusted-0296001" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-02960019/nuget/v3/index.json" />
2619
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2720
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2821
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2922
<!-- Begin: Package sources from dotnet-runtime -->
30-
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
31-
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-2/nuget/v3/index.json" />
32-
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-1/nuget/v3/index.json" />
3323
<!-- End: Package sources from dotnet-runtime -->
3424
<!-- Begin: Package sources from dotnet-templating -->
3525
<add key="darc-pub-dotnet-templating-6c7fa94" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6c7fa943/nuget/v3/index.json" />
3626
<!-- End: Package sources from dotnet-templating -->
3727
<!-- Begin: Package sources from dotnet-windowsdesktop -->
38-
<add key="darc-int-dotnet-windowsdesktop-5fa74c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83-2/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83-1/nuget/v3/index.json" />
4128
<!-- End: Package sources from dotnet-windowsdesktop -->
4229
<!-- Begin: Package sources from dotnet-winforms -->
4330
<!-- End: Package sources from dotnet-winforms -->
@@ -64,9 +51,6 @@
6451
<!-- Begin: Package sources from dotnet-templating -->
6552
<!-- End: Package sources from dotnet-templating -->
6653
<!-- Begin: Package sources from dotnet-aspnetcore -->
67-
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="true" />
68-
<add key="darc-int-dotnet-aspnetcore-277e317-2" value="true" />
69-
<add key="darc-int-dotnet-aspnetcore-277e317" value="true" />
7054
<!-- End: Package sources from dotnet-aspnetcore -->
7155
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
7256
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@@ -76,14 +60,8 @@
7660
<!-- End: Package sources from dotnet-format -->
7761
<!-- End: Package sources from dotnet-aspnetcore -->
7862
<!-- Begin: Package sources from dotnet-runtime -->
79-
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
80-
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
81-
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
8263
<!-- End: Package sources from dotnet-runtime -->
8364
<!-- Begin: Package sources from dotnet-windowsdesktop -->
84-
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-1" value="true" />
85-
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-2" value="true" />
86-
<add key="darc-int-dotnet-windowsdesktop-5fa74c8" value="true" />
8765
<!-- Begin: Package sources from dotnet-winforms -->
8866
<!-- End: Package sources from dotnet-winforms -->
8967
<!-- End: Package sources from dotnet-windowsdesktop -->

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>6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.37">
58+
<Dependency Name="Microsoft.Build" Version="17.10.38">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>da89d7e734ee4174f5a95703b2cdd4ea592f4f69</Sha>
60+
<Sha>02960019913e12a2a104a41249c9f8df2c2aa20d</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.37-servicing-25408-07">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.38-servicing-25411-06">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>da89d7e734ee4174f5a95703b2cdd4ea592f4f69</Sha>
64+
<Sha>02960019913e12a2a104a41249c9f8df2c2aa20d</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.37-servicing-25408-07">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.38-servicing-25411-06">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>da89d7e734ee4174f5a95703b2cdd4ea592f4f69</Sha>
68+
<Sha>02960019913e12a2a104a41249c9f8df2c2aa20d</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.37</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.10.38</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.37-servicing-25408-07</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.10.38-servicing-25411-06</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)