Skip to content

Commit 2cb8a79

Browse files
dagooddagood
authored
Update master to build 3.0 preview submodules (#930)
* Update submodules with clear 3.0 preview1 tags * Update submodules by examining packages * Fix patches * Simplify and fix Roslyn build * Fix and simplify MSBuild build command * Fix NuGet pack failure and package version * Fix SDK command, match switch to Arcade * Patch cli-migrate, fsharp to fix dependencies * Fix CLI build, simplify Add repo-specific target emptying file and Arcade feature to support it. This makes sure test projects don't fail when custom targets Arcade doesn't know to disable end up running and assuming e.g. the Restore target ran earlier. * Fix toolset build * Update prebuilt baselines * For Roslyn, set SourceRevisionId to commit hash * Workaround: CentralPackageVersions sdk as override
1 parent 895f18f commit 2cb8a79

36 files changed

+650
-387
lines changed

‎patches/arcade/0006-Add-support-for-repo-specific-Empty.targets.patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From b7a624db1984d998d556803f98adf0e39b013bb2 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 12 Dec 2018 11:37:14 -0600
4+
Subject: [PATCH] Add support for repo-specific Empty.targets
5+
6+
---
7+
src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
11+
index d0181a5..0921b96 100644
12+
--- a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
13+
+++ b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
14+
@@ -27,4 +27,5 @@
15+
16+
<Import Project="..\tools\Imports.targets" Condition="!$(_SuppressSdkImports) and !$(_SuppressAllTargets)" />
17+
<Import Project="..\tools\Empty.targets" Condition="!$(_SuppressSdkImports) and $(_SuppressAllTargets)"/>
18+
+ <Import Project="$(RepositoryEngineeringDir)Empty.targets" Condition="Exists('$(RepositoryEngineeringDir)Empty.targets') and !$(_SuppressSdkImports) and $(_SuppressAllTargets)"/>
19+
</Project>
20+
--
21+
2.17.1.windows.2
22+

‎patches/arcade/0007-Suppress-Publish-target.patch

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From f82a7f840034712f980b5e2e25cb185656755d6d Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 12 Dec 2018 11:37:28 -0600
4+
Subject: [PATCH] Suppress "Publish" target
5+
6+
---
7+
src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
11+
index 260c8c2..706989c 100644
12+
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
13+
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
14+
@@ -18,5 +18,6 @@
15+
<Target Name="Build"/>
16+
<Target Name="Test"/>
17+
<Target Name="Pack"/>
18+
+ <Target Name="Publish"/>
19+
20+
</Project>
21+
--
22+
2.17.1.windows.2
23+

‎patches/cli-migrate/0001-Use-prebuilt-as-reference-package.patch

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 8dcc5e5e5b093262778465f4f57cf36577dfd08e Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Tue, 11 Dec 2018 12:17:13 -0600
4+
Subject: [PATCH] Use prebuilt as reference package
5+
6+
The new version of Microsoft.CodeAnalysis.CSharp doesn't support
7+
netstandard1.6 anymore, so keep using the checked-in version as ref.
8+
---
9+
.../Microsoft.DotNet.ProjectJsonMigration.csproj | 2 +-
10+
1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj
13+
index 08e86b22..c5b4de14 100644
14+
--- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj
15+
+++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj
16+
@@ -11,7 +11,7 @@
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsVersion)" />
20+
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
21+
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.1.0" />
22+
<PackageReference Include="NuGet.Packaging.Core" Version="$(NuGetPackagingCoreVersion)" />
23+
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
24+
<PackageReference Include="System.Collections.Specialized" Version="$(SystemCollectionsSpecializedVersion)" />
25+
--
26+
2.17.1.windows.2
27+

‎patches/cli/0001-Add-RuntimeFrameworkVersion-to-build-with-source-bui.patch

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

‎patches/cli/0001-Implement-PVP-repo-API.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From f6bd9e985499c212d4e6c2b63b89f75547f5ae17 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Tue, 11 Dec 2018 14:36:29 -0600
4+
Subject: [PATCH] Implement PVP repo API
5+
6+
This is most likely temporary until we have a way to change dependencies
7+
using Arcade, or Arcade supports the repo API itself.
8+
---
9+
eng/Versions.props | 3 +++
10+
1 file changed, 3 insertions(+)
11+
12+
diff --git a/eng/Versions.props b/eng/Versions.props
13+
index 9029775d9..870d9fee4 100644
14+
--- a/eng/Versions.props
15+
+++ b/eng/Versions.props
16+
@@ -47,6 +47,9 @@
17+
<NUnit3TemplatesVersion>1.5.1</NUnit3TemplatesVersion>
18+
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
19+
</PropertyGroup>
20+
+ <!-- Override isolated build dependency versions with versions from Repo API. -->
21+
+ <Import Project="$(DotNetPackageVersionPropsPath)"
22+
+ Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
23+
<PropertyGroup>
24+
<RestoreSources>
25+
$(RestoreSources);
26+
--
27+
2.17.1.windows.2
28+

‎patches/cli/0002-Exclude-test-projects-from-source-build.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 77fdf8dde8f9dd3e17c4b6b05c44b1f78674ec34 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 12 Dec 2018 10:39:16 -0600
4+
Subject: [PATCH] Exclude test projects from source-build
5+
6+
Arcade didn't seem to carry over the logic to set ExcludeFromSourceBuild
7+
to true when IsTestProject is set. A fix would likely be in Arcade.
8+
---
9+
TestAssets/Directory.Build.props | 4 ++++
10+
test/Directory.Build.props | 4 ++++
11+
2 files changed, 8 insertions(+)
12+
13+
diff --git a/TestAssets/Directory.Build.props b/TestAssets/Directory.Build.props
14+
index 905549edc..f6c63df4e 100644
15+
--- a/TestAssets/Directory.Build.props
16+
+++ b/TestAssets/Directory.Build.props
17+
@@ -1,3 +1,7 @@
18+
<Project>
19+
<!-- Empty Directory.Build.props file to prevent test asset projects from picking up the repo's Directory.Build.props' -->
20+
+
21+
+ <PropertyGroup>
22+
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
23+
+ </PropertyGroup>
24+
</Project>
25+
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
26+
index 406c4f8c1..62d043078 100644
27+
--- a/test/Directory.Build.props
28+
+++ b/test/Directory.Build.props
29+
@@ -4,4 +4,8 @@
30+
<PropertyGroup>
31+
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
32+
</PropertyGroup>
33+
+
34+
+ <PropertyGroup>
35+
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
36+
+ </PropertyGroup>
37+
</Project>
38+
--
39+
2.17.1.windows.2
40+

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

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

‎patches/cli/0003-Add-repo-specific-target-emptying-file.patch

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 5f428d6ea7077c112b36d562a6d277a5511e9a30 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 12 Dec 2018 11:41:20 -0600
4+
Subject: [PATCH] Add repo-specific target emptying file
5+
6+
---
7+
eng/Empty.targets | 24 ++++++++++++++++++++++++
8+
1 file changed, 24 insertions(+)
9+
create mode 100644 eng/Empty.targets
10+
11+
diff --git a/eng/Empty.targets b/eng/Empty.targets
12+
new file mode 100644
13+
index 000000000..54cfba7dd
14+
--- /dev/null
15+
+++ b/eng/Empty.targets
16+
@@ -0,0 +1,24 @@
17+
+<?xml version="1.0" encoding="utf-8"?>
18+
+<!-- All Rights Reserved. Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
19+
+<Project DefaultTargets="Build">
20+
+
21+
+ <!--
22+
+ Import this file to suppress all targets while allowing the project to participate in the build.
23+
+ Workaround for https://github.com/dotnet/sdk/issues/2071.
24+
+
25+
+ Arcade has a default set of targets to clear. This file adds additional ones specific to this repository.
26+
+
27+
+ The targets defined here are not sufficient for the project to be open in Visual Studio without issues though.
28+
+ -->
29+
+
30+
+ <Target Name="PrepareTests"/>
31+
+ <Target Name="CreateTestAssetPackageNuPkgs"/>
32+
+ <Target Name="CopyDirectoryBuildTestDependencies"/>
33+
+ <Target Name="PrecompileScript"/>
34+
+ <Target Name="WriteExpectedVersion"/>
35+
+ <Target Name="WriteExpectedTargetFrameworkMoniker"/>
36+
+ <Target Name="CreateNupkgFromSource"/>
37+
+ <Target Name="CreateNupkgWithDifferentCasingFromSource"/>
38+
+ <Target Name="CreateNupkgWithShimFromSource"/>
39+
+
40+
+</Project>
41+
--
42+
2.17.1.windows.2
43+

‎patches/core-setup/0001-Copy-run.cmd-changes-from-corefx.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 38b78fc594c2dcc709d1bb7577fd6579b33983e6 Mon Sep 17 00:00:00 2001
1+
From 7a45f1cd9cc4ac5acaea073e6e8a98da277ff602 Mon Sep 17 00:00:00 2001
22
From: Davis Goodin <dagood@microsoft.com>
33
Date: Mon, 26 Nov 2018 18:42:05 -0600
44
Subject: [PATCH] Copy run.cmd changes from corefx
@@ -9,7 +9,7 @@ This uses .NET Core msbuild, not desktop
99
1 file changed, 45 insertions(+), 7 deletions(-)
1010

1111
diff --git a/run.cmd b/run.cmd
12-
index b12a0f7b..7a2fb135 100644
12+
index f86fcae3..7a2fb135 100644
1313
--- a/run.cmd
1414
+++ b/run.cmd
1515
@@ -1,6 +1,22 @@
@@ -41,7 +41,7 @@ index b12a0f7b..7a2fb135 100644
4141
if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
4242
if not exist "%_VSCOMNTOOLS%" (
4343
- echo Error: Visual Studio 2015 or 2017 required.
44-
- echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.
44+
- echo Please see https://github.com/dotnet/core-setup/blob/master/Documentation/building/windows-instructions.md for build instructions.
4545
- exit /b 1
4646
+ echo Error: Visual Studio 2015 or 2017 required.
4747
+ echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.

‎patches/fsharp/0001-Use-MSBuild-as-a-reference-package.patch

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From fab7e82b0add0b921f81763984a05ba0cd389350 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Wed, 12 Dec 2018 12:30:41 -0600
4+
Subject: [PATCH] Use MSBuild as a reference package
5+
6+
Don't use source-built MSBuild: it no longer supports netstandard2.0.
7+
---
8+
src/buildfromsource/targets/PackageVersions.props | 12 ++++++++----
9+
1 file changed, 8 insertions(+), 4 deletions(-)
10+
11+
diff --git a/src/buildfromsource/targets/PackageVersions.props b/src/buildfromsource/targets/PackageVersions.props
12+
index 1186f2bf3..e60dec2b2 100644
13+
--- a/src/buildfromsource/targets/PackageVersions.props
14+
+++ b/src/buildfromsource/targets/PackageVersions.props
15+
@@ -22,10 +22,6 @@
16+
<SystemValueTuplePackageVersion>4.4.0</SystemValueTuplePackageVersion>
17+
18+
<!-- other packages -->
19+
- <MicrosoftBuildPackageVersion>15.1.548</MicrosoftBuildPackageVersion>
20+
- <MicrosoftBuildFrameworkPackageVersion>15.1.548</MicrosoftBuildFrameworkPackageVersion>
21+
- <MicrosoftBuildTasksCorePackageVersion>15.1.548</MicrosoftBuildTasksCorePackageVersion>
22+
- <MicrosoftBuildUtilitiesCorePackageVersion>15.1.548</MicrosoftBuildUtilitiesCorePackageVersion>
23+
<MicrosoftWin32RegistryPackageVersion>4.3.0</MicrosoftWin32RegistryPackageVersion>
24+
25+
</PropertyGroup>
26+
@@ -33,4 +29,12 @@
27+
<!-- dependency uptake version overrides -->
28+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != '' AND Exists('$(DotNetPackageVersionPropsPath)')" />
29+
30+
+ <!-- Package versions needed as reference assmblies that should not be taken from source-build. -->
31+
+ <PropertyGroup>
32+
+ <MicrosoftBuildPackageVersion>15.1.548</MicrosoftBuildPackageVersion>
33+
+ <MicrosoftBuildFrameworkPackageVersion>15.1.548</MicrosoftBuildFrameworkPackageVersion>
34+
+ <MicrosoftBuildTasksCorePackageVersion>15.1.548</MicrosoftBuildTasksCorePackageVersion>
35+
+ <MicrosoftBuildUtilitiesCorePackageVersion>15.1.548</MicrosoftBuildUtilitiesCorePackageVersion>
36+
+ </PropertyGroup>
37+
+
38+
</Project>
39+
--
40+
2.17.1.windows.2
41+

‎patches/msbuild/0001-Consolidate-versions-of-System.Threading.Tasks.Dataf.patch

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

0 commit comments

Comments
 (0)