Skip to content

Commit 895f18f

Browse files
crummeldagood
crummel
authored and
dagood
committed
Update source-build to use core repos with Arcade (#916)
* Update to latest CoreFX master with Arcade. * Remove outdated CoreFX patch. * Don't think this is needed anymore. * Update build command for CoreFX * "--" no longer needed in arguments. * Add global.json to source-build. * Add Arcade to source-build. * Fix global.json. * Call Arcade init in init-tools * New SDK appears to want this lowercased extension. * Some more tweaks to how Arcade is loaded. * CoreFX has a global.json now. * Allow skipping global.json values and add alternate SDK path. * A couple more properties to pass into CoreFX for Arcade. * Add another CoreFX SDK for us to restore. * Revert "Don't think this is needed anymore." This reverts commit 2bce8d8. * Revert "Revert "Don't think this is needed anymore."" This reverts commit 4b4773f. * Update submodules * Add patches for arcade * update arcade version * update proj files * update standard * patch standard * Fix/reapply patches after merge * add source to restore, add BuildToolsPackageDir to dir.props * revert 554083d * Clean up Arcade init scripts Remove old scripts that don't exist in Arcade anymore. Make eng/common/tools.sh executable. Fix Windows init-tools. Change \ to / for PACKAGES_DIR because the \ was escaping a ", causing mayhem in the inner init-tools.cmd. The CoreFX init-tools call (through Arcade) also uses /. * Add Arcade submodule Starts with WIP branch, adds fixes and repo dependencies. Converts the fork to patches on an official commit. Add Arcade to known good, add prereq for CoreFX. Migrate roslyn-tools to new SDK toolset flow. * Fix ref package resassembly: *, not *.* In certain packages, there are files with no extension. Failing to repack these causes failures when restored. For example, runtime.linux-x64.Microsoft.NETCore.DotNetAppHost/3.0.0-preview-27115-02 is missing runtimes/linux-x64/native/apphost when repacked. * Fix Arcade bool arg passing on Windows * Ensure CoreFX uses our BuildTools Manually set new-style semaphore using BuildToolsVersion.txt. * Configure CoreFX to build properly Disable node reuse. Add --pack. Fix PackagesOutput. Pass Arcade args in Windows-friendly way. For Win, replace "-buildArch" with "/p:ArchGroup". The shell scripts make this translation, but Windows scripts don't. * Disable dotnet/standard node reuse, use Arcade * Upgrade CoreCLR to CoreFX dependency This gets the Index and Range types, fixing GenFacades errors. * Address my own style comments from review * Remove arcade-minimalci-sample This submodule was here to try out Arcade. Now we are really using Arcade, so it's unnecessary. * Remove unused Arcade common scripts We can wait until we actually onboard to Arcade to take these. * Remove CoreCLR PackagesOutput: use Repo API * Standard global.json update (merge duplication) * Clean up patches * Use source-built IL SDK in CoreFX to fix offline The part of CoreFX that restores this package doesn't seem to use the prebuilt directory correctly. Use a source-built SDK to remove the prebuilt and fix the failure. * Update baselines * Revert "--source" passed to echo but not command
1 parent 7220fcc commit 895f18f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+15133
-292
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@
7575
[submodule "src/aspnet-razor"]
7676
path = src/aspnet-razor
7777
url = https://github.com/aspnet/Razor
78+
[submodule "src/arcade"]
79+
path = src/arcade
80+
url = https://github.com/dotnet/arcade

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0-preview1-03013-01
1+
3.0.0-preview1-03406-03

‎Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
5+
<_SuppressSdkImports>true</_SuppressSdkImports>
6+
</PropertyGroup>
7+
</Project>

‎Directory.Build.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
</Project>

‎NuGet.Config renamed to ‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
<clear />
66
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
77
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
8+
<add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
9+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
810
</packageSources>
911
</configuration>

‎build-source-tarball.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ cp $SCRIPT_ROOT/*.props $TARBALL_ROOT/
108108
cp $SCRIPT_ROOT/*.targets $TARBALL_ROOT/
109109
cp $SCRIPT_ROOT/init-tools.msbuild $TARBALL_ROOT/
110110
cp $SCRIPT_ROOT/DotnetCLIVersion.txt $TARBALL_ROOT/
111+
cp $SCRIPT_ROOT/BuildToolsVersion.txt $TARBALL_ROOT/
111112
cp $SCRIPT_ROOT/ProdConFeed.txt $TARBALL_ROOT/
112113
cp $SCRIPT_ROOT/smoke-test* $TARBALL_ROOT/
113114
cp -r $SCRIPT_ROOT/keys $TARBALL_ROOT/

‎dependencies.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<MicrosoftNETSdkRazorPackageVersion>2.1.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

30+
<!-- Package versions used as toolsets -->
31+
<PropertyGroup>
32+
<BuildToolsPackage>microsoft.dotnet.buildtools</BuildToolsPackage>
33+
<BuildToolsPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)BuildToolsVersion.txt').Trim())</BuildToolsPackageVersion>
34+
</PropertyGroup>
35+
3036
<!-- Build stabilization properties as passed in by ProdCon. -->
3137
<PropertyGroup>
3238
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>

‎dir.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@
137137
<CliInternalBuildVersion>30000001-1</CliInternalBuildVersion>
138138
</PropertyGroup>
139139

140+
<!-- With Arcade, this package version is stored in a property we need to override. -->
141+
<ItemGroup>
142+
<ExtraPackageVersionPropsPackageInfo Include="BuildToolsPackageVersion" Version="$(BuildToolsPackageVersion)" />
143+
</ItemGroup>
144+
140145
<ItemGroup>
141146
<ExtraPackageVersionPropsPackageInfo Include="DotnetCliInternalVersion" Version="3.0.100-$(CliInternalReleaseTag)-$(CliInternalBuildVersion)" />
142147
</ItemGroup>

‎eng/Version.Details.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Dependencies>
3+
<ProductDependencies></ProductDependencies>
4+
<ToolsetDependencies>
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18531.9">
6+
<Uri>https://github.com/dotnet/arcade</Uri>
7+
<Sha>4ffd1c0020510ffed9e854834df13f0207056012</Sha>
8+
</Dependency>
9+
</ToolsetDependencies>
10+
</Dependencies>

‎eng/Versions.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VersionPrefix>1.0.0</VersionPrefix>
5+
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
6+
</PropertyGroup>
7+
</Project>

0 commit comments

Comments
 (0)