Skip to content

Commit e50ba2d

Browse files
crummelcrummel
authored
Update source-build master to core repo masters (#658)
Most of the work here was in adding the new toolset and core-sdk repos and adjusting our current process to the way they work. I also had the usual build number/hash updates. This includes a few workarounds and patches that I believe are all tagged with an associated issue or PR.
1 parent ebd34dc commit e50ba2d

29 files changed

+932
-16
lines changed

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,9 @@
6363
[submodule "src/roslyn-tools"]
6464
path = src/roslyn-tools
6565
url = https://github.com/dotnet/roslyn-tools
66+
[submodule "src/core-sdk"]
67+
path = src/core-sdk
68+
url = https://github.com/dotnet/core-sdk
69+
[submodule "src/toolset"]
70+
path = src/toolset
71+
url = https://github.com/dotnet/toolset

‎dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<Import Project="$(ProjectDir)dependencies.props" />
9090

9191
<PropertyGroup>
92-
<RootRepo>cli</RootRepo>
92+
<RootRepo>known-good</RootRepo>
9393
<!-- Temporarily update RootRepo for Windows to core-setup repo project
9494
until all repos build clean out of master -->
9595
<RootRepo Condition="'$(OS)' == 'Windows_NT'">core-setup</RootRepo>

‎patches/cli/0001-Fix-OrchestratedPackageVersionProps-for-source-build.patch

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 50c21af57be8b6a6cd379556ef156670f01d1533 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Tue, 17 Jul 2018 15:00:24 -0500
4+
Subject: [PATCH] Fix OrchestratedPackageVersionProps for source-build.
5+
6+
When InitRepo was removed, the call to DownloadPackageVersionProps did
7+
not get moved elsewhere. This change restores it and the properties
8+
that the target depends on.
9+
10+
This patch can be removed when https://github.com/dotnet/cli/pull/9700
11+
is merged.
12+
---
13+
Directory.Build.props | 3 +++
14+
build/Prepare.targets | 1 +
15+
2 files changed, 4 insertions(+)
16+
17+
diff --git a/Directory.Build.props b/Directory.Build.props
18+
index cabea4e55..108ebda8a 100644
19+
--- a/Directory.Build.props
20+
+++ b/Directory.Build.props
21+
@@ -17,6 +17,9 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
22+
23+
<PropertyGroup>
24+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
25+
+ <RelativeGeneratedPropsDir>bin/obj</RelativeGeneratedPropsDir>
26+
+ <GeneratedPropsDir>$(RepoRoot)/$(RelativeGeneratedPropsDir)</GeneratedPropsDir>
27+
+ <OrchestratedPackageVersionsProps>$(GeneratedPropsDir)/OrchestratedPackageVersionsProps.props</OrchestratedPackageVersionsProps>
28+
29+
<NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
30+
<NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
31+
diff --git a/build/Prepare.targets b/build/Prepare.targets
32+
index f4cb25b37..1cbd1db5b 100644
33+
--- a/build/Prepare.targets
34+
+++ b/build/Prepare.targets
35+
@@ -7,6 +7,7 @@
36+
37+
<Target Name="Init"
38+
DependsOnTargets="SetTelemetryProfile;
39+
+ DownloadPackageVersionsProps;
40+
BuildDotnetCliBuildFramework;">
41+
</Target>
42+
43+
--
44+
2.14.1
45+

‎patches/cli/0002-Fix-archiving-to-.zip.patch

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From f8fcb2ce36ec228d58cf4a5923e72e8a5ea9cdf6 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Tue, 17 Jul 2018 13:26:23 -0500
4+
Subject: [PATCH] Fix archiving to .zip.
5+
6+
All CLI archives are named with .zip, but without this patch will
7+
still archive to gzip format on Linux. This confuses downstream
8+
repos when they determine the archive type by extension.
9+
10+
This patch can be removed when https://github.com/dotnet/cli/pull/9699
11+
is merged.
12+
---
13+
build/package/Archive.targets | 8 --------
14+
1 file changed, 8 deletions(-)
15+
16+
diff --git a/build/package/Archive.targets b/build/package/Archive.targets
17+
index cbbbfe63c..a36d06983 100644
18+
--- a/build/package/Archive.targets
19+
+++ b/build/package/Archive.targets
20+
@@ -17,14 +17,6 @@
21+
</PropertyGroup>
22+
23+
<ZipFileCreateFromDirectory
24+
- Condition=" '$(OS)' == 'Windows_NT' "
25+
- SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
26+
- DestinationArchive="$(GenerateArchivesDestinationArchive)"
27+
- OverwriteDestination="true"
28+
- ExcludePatterns="%(GenerateArchivesInputsOutputs.ExcludePatterns)" />
29+
-
30+
- <TarGzFileCreateFromDirectory
31+
- Condition=" '$(OS)' != 'Windows_NT' "
32+
SourceDirectory="%(GenerateArchivesInputsOutputs.InputDirectory)"
33+
DestinationArchive="$(GenerateArchivesDestinationArchive)"
34+
OverwriteDestination="true"
35+
--
36+
2.14.1
37+

‎patches/cli/0003-Use-netcoreapp3.0-for-compatibility-with-everything-.patch

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From f283a6b126356fdc7dcb7c803b65c5cb473b78d9 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Tue, 17 Jul 2018 15:30:48 -0500
4+
Subject: [PATCH] Use netcoreapp3.0 for compatibility with everything else.
5+
6+
This patch needs further research. I believe it will become unnecessary
7+
after core-setup/cli/toolset/core-sdk have been synced.
8+
---
9+
Directory.Build.props | 4 ++--
10+
1 file changed, 2 insertions(+), 2 deletions(-)
11+
12+
diff --git a/Directory.Build.props b/Directory.Build.props
13+
index 108ebda8a..2445f7fc3 100644
14+
--- a/Directory.Build.props
15+
+++ b/Directory.Build.props
16+
@@ -33,9 +33,9 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
17+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
18+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
19+
20+
- <CliTargetFramework>netcoreapp2.2</CliTargetFramework>
21+
+ <CliTargetFramework>netcoreapp3.0</CliTargetFramework>
22+
<!-- We only need this until we get a stage0 with a 2.2 SDK. -->
23+
- <NETCoreAppMaximumVersion>2.2</NETCoreAppMaximumVersion>
24+
+ <NETCoreAppMaximumVersion>3.0</NETCoreAppMaximumVersion>
25+
</PropertyGroup>
26+
27+
<Import Project="build/BranchInfo.props" />
28+
--
29+
2.14.1
30+

‎patches/core-sdk/0001-Add-dependency-for-restoring-packages-before-trying-.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 5fab2468f55d4209edf98bb3b00b5d3ec5b6d909 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Fri, 13 Jul 2018 10:52:33 -0500
4+
Subject: [PATCH] Add dependency for restoring packages before trying to find
5+
Microsoft.NETCore.DotNetAppHost package.
6+
7+
This appears to be a difference between the 2.2.0-preview SDK currently
8+
being used in core-sdk and the 2.1.401-preview SDK currently being used
9+
in source-build. In the 2.2.0 SDK, this target happens to run before
10+
the resolved package list is used, but in the 2.1.401 it is not, so I
11+
added the explicit dependency (doesn't affect anything in the 2.2.0 SDK).
12+
13+
This patch can be removed after https://github.com/dotnet/core-sdk/pull/34
14+
is merged.
15+
---
16+
src/redist/redist.csproj | 2 +-
17+
1 file changed, 1 insertion(+), 1 deletion(-)
18+
19+
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
20+
index ac8ccb4de..73597e874 100644
21+
--- a/src/redist/redist.csproj
22+
+++ b/src/redist/redist.csproj
23+
@@ -77,7 +77,7 @@
24+
</MSBuild>
25+
</Target>
26+
27+
- <Target Name="PublishAppHostTemplate">
28+
+ <Target Name="PublishAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies">
29+
30+
<PropertyGroup>
31+
<NETCoreDotNetAppHostPackageName>Microsoft.NETCore.DotNetAppHost</NETCoreDotNetAppHostPackageName>
32+
--
33+
2.14.1
34+

‎patches/core-sdk/0002-Experimental-change-to-fix-OSX-don-t-think-we-need-t.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 234cae6a6a802edd60f729f455ff751e79c4b04f Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Thu, 19 Jul 2018 15:13:12 -0500
4+
Subject: [PATCH] Experimental change to fix OSX - don't think we need this
5+
after the repo split.
6+
7+
---
8+
build/BundledRuntimes.props | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
12+
index 2de7068b0..8958a919c 100644
13+
--- a/build/BundledRuntimes.props
14+
+++ b/build/BundledRuntimes.props
15+
@@ -1,7 +1,7 @@
16+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
17+
<PropertyGroup>
18+
<CoreSetupRid>$(HostRid)</CoreSetupRid>
19+
- <CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
20+
+ <CoreSetupRid Condition=" '$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' ">$(HostMonikerRid)</CoreSetupRid>
21+
22+
<!-- only the runtime OSX .pkgs have a `-internal` suffix -->
23+
<InstallerStartSuffix Condition="'$(HostOSName)' == 'osx'">-internal</InstallerStartSuffix>
24+
--
25+
2.14.1
26+

0 commit comments

Comments
 (0)