Skip to content

Commit 79ff2b0

Browse files
crummelcrummel
authored
[master] Remove a few more master patches (#719)
* Update core-sdk to latest master and remove patch.
1 parent 438a6f3 commit 79ff2b0

17 files changed

+129
-180
lines changed

‎dir.props

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,29 @@
9797
<Import Project="$(ProjectDir)dependencies.props" />
9898

9999
<PropertyGroup>
100+
<!-- known-good (repos/known-good.proj) conditionally includes submodules based on the platform,
101+
so this will not always correspond to the same repos - see that file for details.
102+
We need an "empty" project after the last real project in order for prebuilt detection
103+
to work, so we always build known-good. -->
100104
<RootRepo>known-good</RootRepo>
101-
<!-- Temporarily update RootRepo for Windows to core-setup repo project
102-
until all repos build clean out of master -->
103-
<RootRepo Condition="'$(OS)' == 'Windows_NT'">core-setup</RootRepo>
104-
<!-- Update RootRepo for arm to only build through core-setup -->
105-
<RootRepo Condition="$(Platform.Contains('arm'))">core-setup</RootRepo>
106105
</PropertyGroup>
107106

108107
<ItemGroup>
109108
<SourceBuiltPackage Include="$(SourceBuiltPackagesPath)/*.nupkg" />
110109
</ItemGroup>
110+
111+
<!-- CLI internal version is statically set by us to a version that will never show up in the wild.
112+
This ensures we will never restore a public version instead of our source-built version. We
113+
invlude the version number because it is used both by CLI.proj and the core-sdk build and they
114+
have to be synced up. ExtraPackageVersionPropsPackageInfo doesn't work in cli.proj because
115+
toolset is between CLI and core-sdk, and the extra package version info is lost. -->
116+
<PropertyGroup>
117+
<CliInternalReleaseTag>source</CliInternalReleaseTag>
118+
<CliInternalBuildVersion>30000001-1</CliInternalBuildVersion>
119+
</PropertyGroup>
120+
121+
<ItemGroup>
122+
<ExtraPackageVersionPropsPackageInfo Include="DotnetCliInternalVersion" Version="3.0.100-$(CliInternalReleaseTag)-$(CliInternalBuildVersion)" />
123+
</ItemGroup>
124+
111125
</Project>

‎patches/core-sdk/0003-Changes-for-Automatic-update-default-package-version.patch

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

‎patches/corefx/0001-Port-4865c849d582e24478f08a224aa1f915bfcfbcde-to-fix.patch renamed to ‎patches/corefx/0001-Update-to-released-SDK.patch

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
From a1ec3cb7060eedf4f9842e8f749d4f6fc8470f8a Mon Sep 17 00:00:00 2001
2-
From: Chris Rummel <crummel@microsoft.com>
3-
Date: Wed, 24 Oct 2018 10:24:51 -0500
4-
Subject: [PATCH] Port 4865c849d582e24478f08a224aa1f915bfcfbcde to fix errors.
1+
From 32bdfc0f1800c14baee5ebe0880d047148b8cea2 Mon Sep 17 00:00:00 2001
2+
From: Wes Haggard <Wes.Haggard@microsoft.com>
3+
Date: Fri, 7 Sep 2018 18:15:25 -0700
4+
Subject: [PATCH] Update to released SDK
55

6+
As part of this we need to disable a roslyn analyzer to workaround
7+
https://github.com/dotnet/roslyn-analyzers/issues/1804.
68
---
79
CodeAnalysis.ruleset | 6 +++++-
8-
1 file changed, 5 insertions(+), 1 deletion(-)
10+
DotnetCLIVersion.txt | 2 +-
11+
2 files changed, 6 insertions(+), 2 deletions(-)
912

1013
diff --git a/CodeAnalysis.ruleset b/CodeAnalysis.ruleset
1114
index 2bf447f3f6..8920fd2575 100644
@@ -22,6 +25,14 @@ index 2bf447f3f6..8920fd2575 100644
2225
+ </Rules>
2326
+</RuleSet>
2427
\ No newline at end of file
28+
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
29+
index 3aa4b00373..6f1c03c6a3 100644
30+
--- a/DotnetCLIVersion.txt
31+
+++ b/DotnetCLIVersion.txt
32+
@@ -1 +1 @@
33+
-2.1.401-preview-009081
34+
+2.1.401
35+
\ No newline at end of file
2536
--
2637
2.18.0
2738

‎repos/cli.proj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<RuntimeArg>--runtime-id $(OverrideTargetRid)</RuntimeArg>
1313

14+
<RuntimeArg Condition="'$(TargetOS)' == 'Linux'">--runtime-id $(TargetRid)</RuntimeArg>
1415
<BuildCommandArgs>--stage0 $(DotNetCliToolDir) $(RuntimeArg)</BuildCommandArgs>
1516

1617
<!--
@@ -44,9 +45,9 @@
4445
</PropertyGroup>
4546

4647
<ItemGroup>
47-
<ExtraPackageVersionPropsPackageInfo Include="Microsoft.AspNetCore.All" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
48-
<ExtraPackageVersionPropsPackageInfo Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
49-
<ExtraPackageVersionPropsPackageInfo Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
48+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAllPackageVersion" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
49+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppPackageVersion" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
50+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETSdkRazorPackageVersion" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
5051
</ItemGroup>
5152

5253
<ItemGroup>
@@ -80,6 +81,9 @@
8081
is fixed we will be able to determine this automatically. -->
8182
<EnvironmentVariables Include="DropSuffix=true"
8283
Condition="'$(UseStableVersions)' == 'true'" />
84+
85+
<EnvironmentVariables Include="ReleaseSuffix=$(CliInternalReleaseTag)" />
86+
<EnvironmentVariables Include="BuildNumber=$(CliInternalBuildVersion)" />
8387
</ItemGroup>
8488

8589
<!-- Inject the ProdConFeed into NuGet.config to pick up AspNetCore packages.

‎repos/core-sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<BuildCommandArgs>$(BuildCommandArgs) /p:SkipBuildingInstallers=true</BuildCommandArgs>
1717
<BuildCommandArgs>$(BuildCommandArgs) /p:IncludeNuGetPackageArchive=false</BuildCommandArgs>
1818
<BuildCommandArgs>$(BuildCommandArgs) /p:IncludeAdditionalSharedFrameworks=false</BuildCommandArgs>
19-
<BuildCommandArgs>$(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false</BuildCommandArgs>
19+
<BuildCommandArgs>$(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=$(PortableBuild)</BuildCommandArgs>
2020
<BuildCommandArgs>$(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false</BuildCommandArgs>
2121

2222
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>

‎repos/coreclr.proj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<!-- core-setup uses the portable RID for OSX all the time, so override -->
6-
<OverridePortableBuild>$(PortableBuild)</OverridePortableBuild>
7-
<OverridePortableBuild Condition="'$(TargetOS)' == 'OSX'">true</OverridePortableBuild>
8-
95
<BuildArguments>$(Platform) $(Configuration) skiptests</BuildArguments>
106
<BuildArguments Condition="'$(SkipDisablePgo)' != 'true'">$(BuildArguments) -nopgooptimize</BuildArguments>
11-
<BuildArguments>$(BuildArguments) -PortableBuild=$(OverridePortableBuild)</BuildArguments>
127
<BuildArguments Condition="'$(OS)' != 'Windows_NT'">$(BuildArguments) msbuildonunsupportedplatform</BuildArguments>
13-
<BuildArguments Condition="'$(UseSystemLibraries)' == 'true'">$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>
8+
<BuildArguments Condition="'$(UseSystemLibraries)' == 'true' AND '$(OS)' != 'Windows_NT'">$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>
149
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) skipnuget cross -skiprestore cmakeargs -DFEATURE_GDBJIT=TRUE</BuildArguments>
10+
<!-- Portable builds only apply to Linux - Mac and Windows are both always portable.
11+
Additionally, Linux builds are portable by default and only have a switch to turn it off -->
12+
<BuildArguments Condition="'$(TargetOS)' == 'Linux' and '$(PortableBuild)' == 'false'">$(BuildArguments) -PortableBuild=false</BuildArguments>
13+
1514
<BuildArguments>$(BuildArguments) --</BuildArguments>
1615

1716
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>

‎repos/dir.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<_AdditionalAssetDirs Include="$(SourceBuiltToolsetDir)" Condition="Exists('$(SourceBuiltToolsetDir)')" />
168168
</ItemGroup>
169169
<WriteBuildOutputProps NuGetPackages="@(_PreviouslySourceBuiltPackages)"
170-
ExtraPackageInfo="@(ExtraPackageVersionPropsPackageInfo)"
170+
ExtraProperties="@(ExtraPackageVersionPropsPackageInfo)"
171171
AdditionalAssetDirs="@(_AdditionalAssetDirs)"
172172
OutputPath="$(PackageVersionPropsPath)" />
173173

‎repos/known-good.proj

Lines changed: 53 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,76 @@
66
<OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<!-- Toolsets -->
11-
<RepositoryReference Include="roslyn-tools" />
9+
<!-- This project file serves a couple of purpose.
10+
- We conditionally include repos based on what works on different platforms/configurations.
11+
- We need an "empty" build after the last real repo for prebuilt detection to work - this is that file.
12+
- If we have a repo that is not in core-sdk's dependency tree, we can still build it by including it here. -->
1213

13-
<!-- Tier 1 -->
14-
<RepositoryReference Include="application-insights" />
15-
<RepositoryReference Include="common" />
16-
<RepositoryReference Include="netcorecli-fsc" />
17-
<RepositoryReference Include="newtonsoft-json" />
18-
<RepositoryReference Include="standard" />
19-
<RepositoryReference Include="xliff-tasks" />
14+
<!-- Windows and ARM builds currently only work through core-setup -->
15+
<Choose>
16+
<When Condition="'$(OS)' == 'Windows_NT'">
17+
<ItemGroup>
18+
<RepositoryReference Include="core-setup" />
19+
</ItemGroup>
20+
</When>
21+
<When Condition="$(Platform.Contains('arm'))">
22+
<ItemGroup>
23+
<RepositoryReference Include="core-setup" />
24+
</ItemGroup>
25+
</When>
26+
<Otherwise>
27+
<ItemGroup>
28+
<!-- Toolsets -->
29+
<RepositoryReference Include="roslyn-tools" />
2030

21-
<RepositoryReference Include="clicommandlineparser" />
22-
<RepositoryReference Include="roslyn" />
31+
<!-- Tier 1 -->
32+
<RepositoryReference Include="application-insights" />
33+
<RepositoryReference Include="common" />
34+
<RepositoryReference Include="netcorecli-fsc" />
35+
<RepositoryReference Include="newtonsoft-json" />
36+
<RepositoryReference Include="standard" />
37+
<RepositoryReference Include="xliff-tasks" />
2338

24-
<!-- Tier 2 -->
25-
<RepositoryReference Include="msbuild" />
26-
<RepositoryReference Include="nuget-client" />
27-
<RepositoryReference Include="websdk" />
28-
<RepositoryReference Include="coreclr" />
39+
<RepositoryReference Include="clicommandlineparser" />
40+
<RepositoryReference Include="roslyn" />
2941

30-
<RepositoryReference Include="templating" />
42+
<!-- Tier 2 -->
43+
<RepositoryReference Include="msbuild" />
44+
<RepositoryReference Include="nuget-client" />
45+
<RepositoryReference Include="websdk" />
46+
<RepositoryReference Include="coreclr" />
3147

32-
<!-- Tier 3 -->
48+
<RepositoryReference Include="templating" />
3349

34-
<RepositoryReference Include="corefx" />
50+
<!-- Tier 3 -->
3551

36-
<!-- Tier 4 -->
52+
<RepositoryReference Include="corefx" />
3753

38-
<RepositoryReference Include="core-setup" />
54+
<!-- Tier 4 -->
3955

40-
<!-- Tier 5 -->
56+
<RepositoryReference Include="core-setup" />
4157

42-
<RepositoryReference Include="sdk" />
43-
<RepositoryReference Include="vstest" />
44-
<RepositoryReference Include="cli-migrate" />
45-
<RepositoryReference Include="fsharp" />
58+
<!-- Tier 5 -->
4659

47-
<!-- Tier 6 -->
60+
<RepositoryReference Include="sdk" />
61+
<RepositoryReference Include="vstest" />
62+
<RepositoryReference Include="cli-migrate" />
63+
<RepositoryReference Include="fsharp" />
4864

49-
<RepositoryReference Include="cli" />
65+
<!-- Tier 6 -->
5066

51-
<!-- Tier 7 -->
67+
<RepositoryReference Include="cli" />
5268

53-
<RepositoryReference Include="toolset" />
69+
<!-- Tier 7 -->
5470

55-
<!-- Tier 8 -->
71+
<RepositoryReference Include="toolset" />
5672

57-
<RepositoryReference Include="core-sdk" />
73+
<!-- Tier 8 -->
5874

59-
</ItemGroup>
75+
<RepositoryReference Include="core-sdk" />
76+
</ItemGroup>
77+
</Otherwise>
78+
</Choose>
6079

6180
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
6281

‎repos/linker.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</Target>
4343

4444
<!-- Replace file includes in nuspec as recommended in the linker repo's ./corebuild/README.md -->
45-
<Target Name="ReplaceNuspecDllIncludeLines" BeforeTargets="Build">
45+
<Target Name="ReplaceNuspecDllIncludeLines" BeforeTargets="Build" Condition="'$(TargetOS)' != 'Windows_NT'">
4646
<PropertyGroup>
4747
<LinkerTasksNuspecFile>$(ProjectDirectory)corebuild/integration/ILLink.Tasks/ILLink.Tasks.nuspec</LinkerTasksNuspecFile>
4848
<NuspecFileContents>

‎repos/nuget-client.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<ToolsDirectory>$(ProjectDirectory)cli/</ToolsDirectory>
88
<NuGetKeyFilePath>$(KeysDir)NuGet.Client.snk</NuGetKeyFilePath>
99
<NuGetClientBuildNumber>5473</NuGetClientBuildNumber>
10+
<ReleaseLabel>rtm</ReleaseLabel>
1011
<RepoApiImplemented>false</RepoApiImplemented>
1112
<!--
1213
This repo is not currently built in ProdCon

0 commit comments

Comments
 (0)