Skip to content

Commit ccdb81f

Browse files
crummelcrummel
committed
Updates to fix up for auto-merge.
- Update CLI version. - CLI appears to no longer handle empty ResourceSources. - Restore ILDasm ourselves as the master version of BuildTools does not include it in this version. - Generate version.c file before corefx build as the master version of BuildTools does not do this automatically in this version. - Update toolset repo and patches. - Update toolset and core-sdk to use reference-assemblies. - Update prebuilt baseline. - Disable dissaembling reference on Windows as they are not rebuilt anyway and are causing a file lock error.
1 parent fb9b914 commit ccdb81f

16 files changed

+201
-263
lines changed

‎DotnetCLIVersion.txt

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

‎build.proj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
<RemoveDir Directories="$(BaseOutputPath)" />
3636
</Target>
3737

38+
<!-- reference assemblies are not rebuilt on Windows, so don't produce them either -->
3839
<Target Name="CopyAndDisassembleReferenceOnlyPackages"
3940
AfterTargets="Build"
40-
Condition="'$(OfflineBuild)' != 'true'">
41+
Condition="'$(OfflineBuild)' != 'true' AND '$(OS)' != 'Windows_NT'">
4142

4243
<CopyReferenceOnlyPackages
4344
PackageCacheDir="$(PackagesDir)"

‎init-tools.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ if [ "$?" != "0" ]; then
179179
exit 1
180180
fi
181181

182+
echo "Restoring ILDasm (workaround for certain buildtools versions)"
183+
cp "$__scriptpath/tools-local/ildasm.depproj" "$__TOOLRUNTIME_DIR/ilasm/"
184+
$__DOTNET_CMD build "${__TOOLRUNTIME_DIR}/ilasm/ildasm.depproj" --packages "${__PACKAGES_DIR}/." --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json -r $__ILASM_RID -p:ILAsmPackageVersion=$__ILASM_VERSION
185+
182186
echo "Making all .sh files executable under Tools."
183187
# Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
184188
ls "$__scriptpath/Tools/"*.sh | xargs chmod +x

‎patches/coreclr/0001-Don-t-check-for-libintl.h-on-Darwin-OSX.patch

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

‎patches/toolset/0003-Experimental-re-enable-RID-workaround.patch renamed to ‎patches/toolset/0001-Experimental-re-enable-RID-workaround.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d6996130694c6f2ab7cf73f840b8684d69d4d9f9 Mon Sep 17 00:00:00 2001
1+
From a6cf4ca264c38277969e1c997bc5c1c180246664 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Wed, 8 Aug 2018 14:32:03 -0500
44
Subject: [PATCH] Experimental: re-enable RID workaround.

‎patches/toolset/0005-Update-CLI-internal-version-to-match-what-source-bui.patch renamed to ‎patches/toolset/0002-Update-CLI-internal-version-to-match-what-source-bui.patch

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
From 34e7974ce80262660e523ba16377fd33b9fbf5c2 Mon Sep 17 00:00:00 2001
1+
From 080ae54d74810833fc0a5549b5c2f31383de895d Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Tue, 17 Jul 2018 12:08:25 -0500
44
Subject: [PATCH] Update CLI internal version to match what source-build
55
produces.
66

77
See https://github.com/dotnet/source-build/issues/657 for details. This
88
patch can be removed after that issue is fixed.
9-
109
---
1110
build/DependencyVersions.props | 2 +-
1211
1 file changed, 1 insertion(+), 1 deletion(-)
1312

1413
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
15-
index 6f6e4f604..fd496a7b4 100644
14+
index 31798051a..0b7e4f5a5 100644
1615
--- a/build/DependencyVersions.props
1716
+++ b/build/DependencyVersions.props
1817
@@ -2,7 +2,7 @@
1918
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2019
<PropertyGroup>
21-
<DotNetCoreSdkLKGVersion>2.2.100-preview1-008982</DotNetCoreSdkLKGVersion>
22-
- <DotnetCliInternalVersion>2.2.100-refac-refac-20180613-1</DotnetCliInternalVersion>
20+
<DotNetCoreSdkLKGVersion>3.0.100-preview-009718</DotNetCoreSdkLKGVersion>
21+
- <DotnetCliInternalVersion>3.0.100-preview-20181105-1</DotnetCliInternalVersion>
2322
+ <DotnetCliInternalVersion>3.0.100-alpha1-00000001-01</DotnetCliInternalVersion>
24-
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34355</MicrosoftAspNetCoreAllPackageVersion>
25-
<MicrosoftAspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
26-
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26529-01</MicrosoftNETCoreAppPackageVersion>
23+
<MicrosoftNETSdkPackageVersion>3.0.100-preview.18554.1</MicrosoftNETSdkPackageVersion>
24+
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAllPackageVersion>
2726
--
28-
2.14.1
27+
2.18.0
2928

‎patches/toolset/0003-Use-runtime-framework-version-produced-by-source-bui.patch

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
From 724b6ef044040525509e9992520f8695c2f5e8d3 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Wed, 7 Nov 2018 00:55:00 -0600
4+
Subject: [PATCH] Use runtime framework version produced by source-build
5+
6+
---
7+
build/DependencyVersions.props | 2 +-
8+
build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 1 +
9+
src/redist/redist.csproj | 1 +
10+
src/tool_cli/tool_cli.csproj | 1 +
11+
src/tool_fsharp/tool_fsc.csproj | 1 +
12+
src/tool_msbuild/tool_msbuild.csproj | 1 +
13+
src/tool_nuget/tool_nuget.csproj | 3 ++-
14+
tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj | 1 +
15+
8 files changed, 9 insertions(+), 2 deletions(-)
16+
17+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
18+
index 0b7e4f5a5..ba8ce7aa7 100644
19+
--- a/build/DependencyVersions.props
20+
+++ b/build/DependencyVersions.props
21+
@@ -1,7 +1,7 @@
22+
<?xml version="1.0" encoding="utf-8"?>
23+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
24+
<PropertyGroup>
25+
- <DotNetCoreSdkLKGVersion>3.0.100-preview-009718</DotNetCoreSdkLKGVersion>
26+
+ <DotNetCoreSdkLKGVersion>2.1.403</DotNetCoreSdkLKGVersion>
27+
<DotnetCliInternalVersion>3.0.100-alpha1-00000001-01</DotnetCliInternalVersion>
28+
<MicrosoftNETSdkPackageVersion>3.0.100-preview.18554.1</MicrosoftNETSdkPackageVersion>
29+
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
30+
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
31+
index c85420dfb..7d7cfba91 100644
32+
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
33+
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
34+
@@ -3,6 +3,7 @@
35+
<Description>Build scripts for dotnet-cli</Description>
36+
<VersionPrefix>1.0.0</VersionPrefix>
37+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
38+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
39+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
40+
<OutputPath>bin\$(Configuration)</OutputPath>
41+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
42+
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
43+
index fbea24ceb..132bcac09 100644
44+
--- a/src/redist/redist.csproj
45+
+++ b/src/redist/redist.csproj
46+
@@ -4,6 +4,7 @@
47+
<PropertyGroup>
48+
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
49+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
50+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
51+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
52+
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
53+
<AssetTargetFallback>dotnet5.4</AssetTargetFallback>
54+
diff --git a/src/tool_cli/tool_cli.csproj b/src/tool_cli/tool_cli.csproj
55+
index 43c6cf930..8c382e1fa 100644
56+
--- a/src/tool_cli/tool_cli.csproj
57+
+++ b/src/tool_cli/tool_cli.csproj
58+
@@ -3,6 +3,7 @@
59+
<PropertyGroup>
60+
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
61+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
62+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
63+
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
64+
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
65+
<AssetTargetFallback>dotnet5.4</AssetTargetFallback>
66+
diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj
67+
index 9067b58cd..d10e38b4f 100644
68+
--- a/src/tool_fsharp/tool_fsc.csproj
69+
+++ b/src/tool_fsharp/tool_fsc.csproj
70+
@@ -3,6 +3,7 @@
71+
72+
<PropertyGroup>
73+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
74+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
75+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
76+
</PropertyGroup>
77+
78+
diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj
79+
index b566fb5b0..27c3d9045 100644
80+
--- a/src/tool_msbuild/tool_msbuild.csproj
81+
+++ b/src/tool_msbuild/tool_msbuild.csproj
82+
@@ -3,6 +3,7 @@
83+
<PropertyGroup>
84+
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
85+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
86+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
87+
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
88+
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
89+
</PropertyGroup>
90+
diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj
91+
index 4d7b842c5..220579066 100644
92+
--- a/src/tool_nuget/tool_nuget.csproj
93+
+++ b/src/tool_nuget/tool_nuget.csproj
94+
@@ -3,6 +3,7 @@
95+
<PropertyGroup>
96+
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
97+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
98+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
99+
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
100+
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
101+
</PropertyGroup>
102+
@@ -10,4 +11,4 @@
103+
<ItemGroup>
104+
<PackageReference Include="NuGet.CommandLine.XPlat" Version="$(NuGetCommandLineXPlatPackageVersion)" />
105+
</ItemGroup>
106+
-</Project>
107+
\ No newline at end of file
108+
+</Project>
109+
diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
110+
index 71a8c46dc..e0644332d 100644
111+
--- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
112+
+++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
113+
@@ -2,5 +2,6 @@
114+
<PropertyGroup>
115+
<TargetFramework>$(CliTargetFramework)</TargetFramework>
116+
<RuntimeIdentifier>$(SharedFrameworkRid)</RuntimeIdentifier>
117+
+ <RuntimeFrameworkVersion>3.0.0-preview1-27023-03</RuntimeFrameworkVersion>
118+
</PropertyGroup>
119+
</Project>
120+
--
121+
2.18.0
122+

‎patches/toolset/0004-Use-netcoreapp3.0-target-frameworks-to-match-the-res.patch

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

‎repos/core-sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
3131

3232
<EnvironmentExternalRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentExternalRestoreSources>
33-
<EnvironmentExternalRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentExternalRestoreSources)%3B$(PrebuiltPackagesPath)</EnvironmentExternalRestoreSources>
33+
<EnvironmentExternalRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentExternalRestoreSources>
3434

3535
<OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
3636
</PropertyGroup>

‎repos/corefx.proj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@
4141

4242
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="AddRidToRuntimeJson" />
4343

44+
<Target Name="GenerateVersionFile"
45+
BeforeTargets="Build"
46+
Condition="'$(TargetOS)' != 'Windows_NT'">
47+
<PropertyGroup>
48+
<GenerateVersionFileCommand>$(ProjectDirectory)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true</GenerateVersionFileCommand>
49+
</PropertyGroup>
50+
51+
<Message Importance="High" Text="Generating version file with $(GenerateVersionFileCommand)" />
52+
53+
<Exec Command="$(GenerateVersionFileCommand) /bl:generateVersionFile.binlog $(RedirectRepoOutputToLog)"
54+
EnvironmentVariables="@(EnvironmentVariables)"
55+
WorkingDirectory="$(ProjectDirectory)" />
56+
57+
</Target>
58+
4459
<Target Name="UpdateRuntimeGraph"
4560
BeforeTargets="Build"
4661
Condition="'$(_IsBootstrapping)' == 'true'">

0 commit comments

Comments
 (0)