Skip to content

Commit 18de2be

Browse files
JanProvaznikJanProvaznik
committed
update msbuild
1 parent f05a11c commit 18de2be

File tree

3 files changed

+13
-25
lines changed

3 files changed

+13
-25
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +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-222749b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-222749b4/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-emsdk -->
98
<!-- Begin: Package sources from dotnet-format -->
109
<add key="darc-pub-dotnet-format-64cbc6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3/nuget/v3/index.json" />
@@ -14,27 +13,18 @@
1413
<add key="darc-pub-dotnet-format-64cbc6c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3-1/nuget/v3/index.json" />
1514
<!-- End: Package sources from dotnet-format -->
1615
<!-- Begin: Package sources from dotnet-aspnetcore -->
17-
<add key="darc-int-dotnet-aspnetcore-c78f4a8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c78f4a81/nuget/v3/index.json" />
1816
<!-- End: Package sources from dotnet-aspnetcore -->
1917
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
20-
<add key="darc-pub-DotNet-msbuild-Trusted-70f0ec6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-70f0ec66/nuget/v3/index.json" />
18+
<add key="darc-int-DotNet-msbuild-Trusted-02bf662" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-02bf6629/nuget/v3/index.json" />
2119
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2220
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2321
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2422
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-574100b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6/nuget/v3/index.json" />
2623
<!-- End: Package sources from dotnet-runtime -->
2724
<!-- Begin: Package sources from dotnet-templating -->
28-
<add key="darc-pub-dotnet-templating-d108a65" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-templating-d108a65-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-5/nuget/v3/index.json" />
30-
<add key="darc-pub-dotnet-templating-d108a65-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-4/nuget/v3/index.json" />
31-
<add key="darc-pub-dotnet-templating-d108a65-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-3/nuget/v3/index.json" />
32-
<add key="darc-pub-dotnet-templating-d108a65-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-2/nuget/v3/index.json" />
33-
<add key="darc-pub-dotnet-templating-d108a65-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d108a65d-1/nuget/v3/index.json" />
3425
<add key="darc-pub-dotnet-templating-a2c4545" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2c45457/nuget/v3/index.json" />
3526
<!-- End: Package sources from dotnet-templating -->
3627
<!-- Begin: Package sources from dotnet-windowsdesktop -->
37-
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7/nuget/v3/index.json" />
3828
<!-- End: Package sources from dotnet-windowsdesktop -->
3929
<!-- Begin: Package sources from dotnet-winforms -->
4030
<!-- End: Package sources from dotnet-winforms -->
@@ -45,6 +35,7 @@
4535
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
4636
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
4737
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
38+
<add key="dotnet8-internal-transport" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet8-internal-transport/nuget/v3/index.json" />
4839
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
4940
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
5041
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -61,17 +52,14 @@
6152
<!-- Begin: Package sources from dotnet-templating -->
6253
<!-- End: Package sources from dotnet-templating -->
6354
<!-- Begin: Package sources from dotnet-aspnetcore -->
64-
<add key="darc-int-dotnet-aspnetcore-c78f4a8" value="true" />
6555
<!-- End: Package sources from dotnet-aspnetcore -->
6656
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
6757
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6858
<!-- Begin: Package sources from dotnet-format -->
6959
<!-- End: Package sources from dotnet-format -->
7060
<!-- Begin: Package sources from dotnet-runtime -->
71-
<add key="darc-int-dotnet-runtime-574100b" value="true" />
7261
<!-- End: Package sources from dotnet-runtime -->
7362
<!-- Begin: Package sources from dotnet-windowsdesktop -->
74-
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="true" />
7563
<!-- Begin: Package sources from dotnet-winforms -->
7664
<!-- End: Package sources from dotnet-winforms -->
7765
<!-- End: Package sources from dotnet-windowsdesktop -->

‎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>222749b48ecb0fe78f236ca9c61f6ff3b09cdc99</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.45">
59-
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
58+
<Dependency Name="Microsoft.Build" Version="17.11.48">
59+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
60+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.45-servicing-25452-07">
63-
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.48-servicing-25466-05">
63+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
64+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.45-servicing-25452-07">
67-
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.48-servicing-25466-05">
67+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
68+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</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
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.11.45</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.11.48</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
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.11.45-servicing-25452-07</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.11.48-servicing-25466-05</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

0 commit comments

Comments
 (0)