Skip to content

Commit 8e38275

Browse files
dagooddagood
authored
Update MSBuild, NuGet.Client to build as used in 2.1.5 and update to SDK 2.1.402 toolset (#791)
* Update MSBuild, NuGet.Client to build as used * Update toolset SDK to 2.1.402 (N-1) * Add patch to ignore NU5123 in CLI * Update baseline for 2.1.402 SDK changes
1 parent 1ec94c6 commit 8e38275

9 files changed

+73
-97
lines changed

‎DotnetCLIVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.301
1+
2.1.402

‎patches/cli/0002-Ignore-NU5123-build-failure-with-SDK-2.1.402.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From da960c2ac8e60edeeba7657b8f8afe56e2488260 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 26 Sep 2018 14:15:23 -0500
4+
Subject: [PATCH] Ignore NU5123: build failure with SDK 2.1.402
5+
6+
The symbol package contains crossgen symbols, and the map files have very long names. This triggers NU5123, new to SDK 2.1.402, which fails the build.
7+
8+
Tracked by https://github.com/dotnet/cli/issues/10052
9+
---
10+
build/BuildDefaults.props | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props
14+
index 1f26ed860..fc501c48d 100644
15+
--- a/build/BuildDefaults.props
16+
+++ b/build/BuildDefaults.props
17+
@@ -30,7 +30,7 @@
18+
<!-- Since we disabled the implict fallback to net461, this will only kick in when we have an explicit fallback and we don't need to be warned about it doing what we asked it to do. -->
19+
<!-- NU5104: Disable 'A stable release of a package should not have a prerelease dependency' warning globally -->
20+
<!-- The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' throws a "NU5104" warning/error while using a "2.1.300" stage0 SDK. For: Linux-x64, Linux-arm, and Linux-arm64 -->
21+
- <NoWarn>NU1701;NU5104</NoWarn>
22+
+ <NoWarn>NU1701;NU5104;NU5123</NoWarn>
23+
24+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
25+
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
26+
--
27+
2.17.1.windows.2
28+

‎patches/msbuild/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎repos/msbuild.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OfficialBuildId>20180426.1</OfficialBuildId>
88
<PackagesOutput>$(ProjectDirectory)/artifacts/$(Configuration)/packages</PackagesOutput>
99

10-
<OutputVersionArgs>/p:VersionPrefix=15.7.179</OutputVersionArgs>
10+
<OutputVersionArgs>/p:VersionPrefix=15.8.169</OutputVersionArgs>
1111
<OutputVersionArgs>$(OutputVersionArgs) /p:DisableNerdbankVersioning=true</OutputVersionArgs>
1212
<OutputVersionArgs>$(OutputVersionArgs) /p:PreReleaseVersionLabel=""</OutputVersionArgs>
1313
<OutputVersionArgs>$(OutputVersionArgs) /p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>

‎repos/nuget-client.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<NuGetCoreSourceDirectory>$(ProjectDirectory)src/NuGet.Core/</NuGetCoreSourceDirectory>
77
<ToolsDirectory>$(ProjectDirectory)cli/</ToolsDirectory>
88
<NuGetKeyFilePath>$(KeysDir)NuGet.Client.snk</NuGetKeyFilePath>
9-
<NuGetClientBuildNumber>5156</NuGetClientBuildNumber>
9+
<NuGetClientBuildNumber>5435</NuGetClientBuildNumber>
1010
<RepoApiImplemented>false</RepoApiImplemented>
1111
<!--
1212
This repo is not currently built in ProdCon

‎src/msbuild

‎src/nuget-client

Submodule nuget-client updated 257 files

‎tools-local/prebuilt-baseline-offline.xml

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
</ProjectDirectories>
3232
<NeverRestoredTarballPrebuilts>
3333
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-03131-06" />
34-
<PackageIdentity Id="Microsoft.NETCore.App" Version="2.1.1" />
34+
<PackageIdentity Id="Microsoft.NETCore.App" Version="2.1.4" />
3535
<PackageIdentity Id="Microsoft.NETCore.ILAsm" Version="2.1.5-servicing-26911-03" />
3636
<PackageIdentity Id="Microsoft.NETCore.ILDAsm" Version="2.1.5-servicing-26911-03" />
3737
<PackageIdentity Id="Microsoft.NETCore.Jit" Version="2.1.5-servicing-26911-03" />
3838
<PackageIdentity Id="Microsoft.NETCore.Runtime.CoreCLR" Version="2.1.5-servicing-26911-03" />
3939
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
40-
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.1" />
40+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.4" />
4141
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.5-servicing-26911-03" />
4242
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.5-servicing-26911-03" />
4343
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.5-servicing-26911-03" />
@@ -51,7 +51,7 @@
5151
<Usage Id="fmdev.ResX" Version="0.2.0" />
5252
<Usage Id="fmdev.xlftool" Version="0.1.3" />
5353
<Usage Id="fmdev.XliffParser" Version="0.5.3" />
54-
<Usage Id="FSharp.Core" Version="4.3.4" />
54+
<Usage Id="FSharp.Core" Version="4.5.2" />
5555
<Usage Id="Libuv" Version="1.9.1" />
5656
<Usage Id="MicroBuild.Core" Version="0.2.0" />
5757
<Usage Id="Microsoft.3rdpartytools.MarkdownLog" Version="0.10.0-alpha-experimental" />
@@ -141,12 +141,12 @@
141141
<Usage Id="Microsoft.NETCore.App" Version="2.0.0-beta-001509-00" />
142142
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" />
143143
<Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" />
144-
<Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" />
144+
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" />
145145
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" />
146146
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
147147
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
148148
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
149-
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" />
149+
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
150150
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.5-servicing-26911-03" />
151151
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
152152
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
@@ -157,13 +157,13 @@
157157
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
158158
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
159159
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
160-
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" />
160+
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
161161
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.5-servicing-26911-03" />
162162
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
163163
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
164164
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
165165
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
166-
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" />
166+
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
167167
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.5-servicing-26911-03" />
168168
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
169169
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.7" />
@@ -176,7 +176,7 @@
176176
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0-beta-25006-01" />
177177
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
178178
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
179-
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview2-26406-04" />
179+
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
180180
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26902-02" />
181181
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
182182
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
@@ -185,7 +185,6 @@
185185
<Usage Id="Microsoft.NETCore.Targets" Version="1.0.1" />
186186
<Usage Id="Microsoft.NETCore.Targets" Version="1.0.3" />
187187
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.0" />
188-
<Usage Id="Microsoft.NETCore.Targets" Version="2.1.0-preview2-26406-04" />
189188
<Usage Id="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
190189
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" />
191190
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.0-alpha-003" />
@@ -226,43 +225,31 @@
226225
<Usage Id="Newtonsoft.Json" Version="8.0.3" />
227226
<Usage Id="Newtonsoft.Json" Version="10.0.3" />
228227
<Usage Id="NuGet.CommandLine" Version="3.4.3" />
229-
<Usage Id="NuGet.Commands" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
230228
<Usage Id="NuGet.Common" Version="4.0.0-rtm-2283" />
231229
<Usage Id="NuGet.Common" Version="4.3.0-preview1-2500" />
232230
<Usage Id="NuGet.Common" Version="4.3.0-preview2-4095" />
233-
<Usage Id="NuGet.Common" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
234231
<Usage Id="NuGet.Configuration" Version="4.3.0-preview1-2500" />
235232
<Usage Id="NuGet.Configuration" Version="4.3.0-preview2-4095" />
236-
<Usage Id="NuGet.Configuration" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
237-
<Usage Id="NuGet.Credentials" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
238233
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview1-2500" />
239234
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview2-4095" />
240-
<Usage Id="NuGet.DependencyResolver.Core" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
241235
<Usage Id="NuGet.Frameworks" Version="4.0.0-rtm-2283" />
242236
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview1-2500" />
243237
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview2-4095" />
244-
<Usage Id="NuGet.Frameworks" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
245238
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview1-2500" />
246239
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview2-4095" />
247-
<Usage Id="NuGet.LibraryModel" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
248240
<Usage Id="NuGet.Packaging" Version="4.0.0-rtm-2283" />
249241
<Usage Id="NuGet.Packaging" Version="4.3.0-preview1-2500" />
250242
<Usage Id="NuGet.Packaging" Version="4.3.0-preview2-4095" />
251-
<Usage Id="NuGet.Packaging" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
252243
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview1-2500" />
253244
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview2-4095" />
254-
<Usage Id="NuGet.Packaging.Core" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
255245
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview1-2500" />
256246
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview2-4095" />
257-
<Usage Id="NuGet.ProjectModel" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
258247
<Usage Id="NuGet.Protocol" Version="4.3.0-preview1-2500" />
259248
<Usage Id="NuGet.Protocol" Version="4.3.0-preview2-4095" />
260-
<Usage Id="NuGet.Protocol" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
261249
<Usage Id="NuGet.Versioning" Version="4.0.0-rtm-2283" />
262250
<Usage Id="NuGet.Versioning" Version="4.3.0-preview1-2500" />
263251
<Usage Id="NuGet.Versioning" Version="4.3.0-preview2-4095" />
264252
<Usage Id="NuGet.Versioning" Version="4.7.0-preview1-4992" />
265-
<Usage Id="NuGet.Versioning" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
266253
<Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
267254
<Usage Id="OpenCover" Version="4.6.519" />
268255
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
@@ -371,22 +358,22 @@
371358
<Usage Id="runtime.unix.System.Runtime.Extensions" Version="4.3.0" Rid="unix" />
372359
<Usage Id="runtime.win-arm64.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-arm64" />
373360
<Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="win-x64" />
374-
<Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
361+
<Usage Id="runtime.win-x64.Microsoft.NETCore.App" Version="2.1.0" Rid="win-x64" />
375362
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="win-x64" />
376-
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
363+
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.0" Rid="win-x64" />
377364
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="win-x64" />
378-
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
365+
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" Rid="win-x64" />
379366
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="win-x64" />
380-
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" Rid="win-x64" />
367+
<Usage Id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" Rid="win-x64" />
381368
<Usage Id="runtime.win-x64.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-x64" />
382369
<Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.0.0" Rid="win-x86" />
383-
<Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
370+
<Usage Id="runtime.win-x86.Microsoft.NETCore.App" Version="2.1.0" Rid="win-x86" />
384371
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="win-x86" />
385-
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
372+
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="2.1.0" Rid="win-x86" />
386373
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="win-x86" />
387-
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
374+
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" Rid="win-x86" />
388375
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="win-x86" />
389-
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview2-26406-04" Rid="win-x86" />
376+
<Usage Id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" Rid="win-x86" />
390377
<Usage Id="runtime.win-x86.runtime.native.System.Data.SqlClient.sni" Version="4.4.0" Rid="win-x86" />
391378
<Usage Id="runtime.win.Microsoft.Win32.Primitives" Version="4.0.1" Rid="win" />
392379
<Usage Id="runtime.win.Microsoft.Win32.Primitives" Version="4.3.0" Rid="win" />
@@ -418,6 +405,7 @@
418405
<Usage Id="System.AppContext" Version="4.3.0" />
419406
<Usage Id="System.Buffers" Version="4.0.0" />
420407
<Usage Id="System.Buffers" Version="4.3.0" />
408+
<Usage Id="System.CodeDom" Version="4.4.0" />
421409
<Usage Id="System.Collections" Version="4.0.11-rc2-24027" />
422410
<Usage Id="System.Collections" Version="4.0.11" />
423411
<Usage Id="System.Collections" Version="4.3.0" />
@@ -427,6 +415,7 @@
427415
<Usage Id="System.Collections.Immutable" Version="1.3.0" />
428416
<Usage Id="System.Collections.Immutable" Version="1.3.1" />
429417
<Usage Id="System.Collections.Immutable" Version="1.4.0" />
418+
<Usage Id="System.Collections.Immutable" Version="1.5.0" />
430419
<Usage Id="System.Collections.NonGeneric" Version="4.0.1" />
431420
<Usage Id="System.Collections.NonGeneric" Version="4.3.0" />
432421
<Usage Id="System.Collections.Specialized" Version="4.0.1" />
@@ -567,6 +556,7 @@
567556
<Usage Id="System.Reflection.Metadata" Version="1.4.1" />
568557
<Usage Id="System.Reflection.Metadata" Version="1.4.2" />
569558
<Usage Id="System.Reflection.Metadata" Version="1.5.0" />
559+
<Usage Id="System.Reflection.Metadata" Version="1.6.0" />
570560
<Usage Id="System.Reflection.Primitives" Version="4.0.1-rc2-24027" />
571561
<Usage Id="System.Reflection.Primitives" Version="4.0.1" />
572562
<Usage Id="System.Reflection.Primitives" Version="4.3.0" />
@@ -645,6 +635,7 @@
645635
<Usage Id="System.Threading.Tasks" Version="4.0.11-rc2-24027" />
646636
<Usage Id="System.Threading.Tasks" Version="4.0.11" />
647637
<Usage Id="System.Threading.Tasks" Version="4.3.0" />
638+
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.5.24" />
648639
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.6.0" />
649640
<Usage Id="System.Threading.Tasks.Dataflow" Version="4.7.0" />
650641
<Usage Id="System.Threading.Tasks.Extensions" Version="4.0.0" />

0 commit comments

Comments
 (0)