Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to arcade 6.0 #6143

Merged
merged 4 commits into from
May 24, 2021
Merged

Update to arcade 6.0 #6143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e34de8
Update to arcade 6.0
benvillalobos Feb 10, 2021
72be073
Update build scripts to match Arcade netcoreapp3.1
benvillalobos Feb 10, 2021
2a9f620
Update net5.0 target frameworks to net6.0
benvillalobos Mar 23, 2021
29e17e9
Opt into prerel SDKs when in VS/MSBuild.exe-driven builds
rainersigwald May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</ItemGroup>

<ItemGroup Condition="'$(MonoBuild)' == 'true' or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp2.1'))">
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="5.0.0"/>
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)"/>
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
Expand Down
8 changes: 6 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21226.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21227.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c58c5dd7f2e9e106368caafb0d4a7a29f4b2e1e9</Sha>
<Sha>cca78ffe3eefdc217e43c2421f2f23355f16da2d</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.10.0-rc.7240">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>dca1d060f38e1e02f6bfca41e25f081f19fd534b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.2.21154.6">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we own this/should we be specifying its version? Do we have a plan for keeping it up-to-date with the version specified in Versions.props?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes: darc subscription. Can't set it up until this merges though.

<Uri>https://github.com/dotnet/runtime</Uri>
<Sha />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-2.20574.26">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e9fd4dc7d74932c0d4b042251bc5a88bb5b3c437</Sha>
Expand Down
6 changes: 5 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@
Can be removed after Arcade moves up. -->
<MicrosoftVSSDKBuildToolsVersion>16.7.13</MicrosoftVSSDKBuildToolsVersion>
</PropertyGroup>
<!-- Production Dependencies -->
<PropertyGroup>
</PropertyGroup>
<!-- Toolset Dependencies -->
<PropertyGroup>
<!-- DotNetCliVersion MUST match the dotnet version in global.json.
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>5.0.102</DotNetCliVersion>
<DotNetCliVersion>6.0.100-preview.2.21155.3</DotNetCliVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.2.21154.6</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNetCompilersToolsetVersion>3.9.0-2.20574.26</MicrosoftNetCompilersToolsetVersion>
<NuGetBuildTasksVersion>5.10.0-rc.7240</NuGetBuildTasksVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/cibuild_bootstrapped_msbuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ try {
else
{
$buildToolPath = $dotnetExePath
$buildToolCommand = Join-Path $bootstrapRoot "net5.0\MSBuild\MSBuild.dll"
$buildToolFramework = "netcoreapp2.1"
$buildToolCommand = Join-Path $bootstrapRoot "net6.0\MSBuild\MSBuild.dll"
$buildToolFramework = "netcoreapp3.1"
}

# Use separate artifacts folder for stage 2
Expand Down
4 changes: 2 additions & 2 deletions eng/cibuild_bootstrapped_msbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ bootstrapRoot="$Stage1Dir/bin/bootstrap"
if [ $host_type = "core" ]
then
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="$bootstrapRoot/net5.0/MSBuild/MSBuild.dll"
_InitializeBuildToolFramework="netcoreapp2.1"
_InitializeBuildToolCommand="$bootstrapRoot/net6.0/MSBuild/MSBuild.dll"
_InitializeBuildToolFramework="netcoreapp3.1"
elif [ $host_type = "mono" ]
then
export _InitializeBuildTool="mono"
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions eng/common/cross/armel/armel.jessie.patch
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/cross/armel/tizen-fetch.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/cross/build-android-rootfs.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 40 additions & 12 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions eng/common/cross/s390x/sources.list.bionic
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions eng/common/cross/toolchain.cmake
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/darc-init.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions eng/common/dotnet-install.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading