Skip to content

Commit 8397008

Browse files
brettfobrettfo
authored
Merge pull request #6765 from dotnet/arcade-net3
fix arcade and .NET 3 SDK
2 parents d59d380 + 4d0ed21 commit 8397008

14 files changed

+81
-16
lines changed

‎DEVGUIDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
2626
Install
2727

2828
- [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472)
29+
- [.NET Core 3 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0)
2930

3031
**NOTE on Windows:**
3132

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3+
<Import Project="eng\targets\Imports.targets" />
34
<Import Project="eng\targets\NuGet.targets" />
45
<Import Project="eng\targets\NGenBinaries.targets" />
56
<Import Project="FSharp.Profiles.props" />

‎eng/Build.ps1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ try {
233233

234234
if ($ci) {
235235
Prepare-TempDir
236+
237+
# enable us to build netcoreapp2.1 binaries
238+
$global:_DotNetInstallDir = Join-Path $RepoRoot ".dotnet"
239+
InstallDotNetSdk $global:_DotNetInstallDir $GlobalJson.tools.dotnet
240+
InstallDotNetSdk $global:_DotNetInstallDir "2.1.503"
236241
}
237242

238243
if ($bootstrap) {

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19262.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19264.13">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>30682cda0dd7ca1765463749dd91ec3cfec75eb9</Sha>
8+
<Sha>670f6ee1a619a2a7c84cfdfe2a1c84fbe94e1c6b</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ function BuildSolution {
237237

238238
InitializeDotNetCli $restore
239239

240+
# enable us to build netcoreapp2.1 binaries
241+
InstallDotNetSdk $_InitializeDotNetCli 2.1.503
242+
240243
BuildSolution
241244

242245
if [[ "$test_core_clr" == true ]]; then

‎eng/common/PublishToPackageFeed.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'TOOLSET'">https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json</TargetStaticFeed>
5454
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'WINDOWSDESKTOP'">https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json</TargetStaticFeed>
5555
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'NUGETCLIENT'">https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json</TargetStaticFeed>
56+
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETENTITYFRAMEWORK6'">https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json</TargetStaticFeed>
5657
</PropertyGroup>
5758

5859
<Error

‎eng/common/cross/arm64/sources.list.buster‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://deb.debian.org/debian buster main
2+
deb-src http://deb.debian.org/debian buster main
3+
4+
deb http://deb.debian.org/debian-security/ buster/updates main
5+
deb-src http://deb.debian.org/debian-security/ buster/updates main
6+
7+
deb http://deb.debian.org/debian buster-updates main
8+
deb-src http://deb.debian.org/debian buster-updates main
9+
10+
deb http://deb.debian.org/debian buster-backports main contrib non-free
11+
deb-src http://deb.debian.org/debian buster-backports main contrib non-free

‎eng/common/cross/arm64/sources.list.stretch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
deb http://deb.debian.org/debian stretch main
2+
deb-src http://deb.debian.org/debian stretch main
3+
4+
deb http://deb.debian.org/debian-security/ stretch/updates main
5+
deb-src http://deb.debian.org/debian-security/ stretch/updates main
6+
7+
deb http://deb.debian.org/debian stretch-updates main
8+
deb-src http://deb.debian.org/debian stretch-updates main
9+
10+
deb http://deb.debian.org/debian stretch-backports main contrib non-free
11+
deb-src http://deb.debian.org/debian stretch-backports main contrib non-free
12+

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
usage()
44
{
5-
echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfs <directory>]"
5+
echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
66
echo "BuildArch can be: arm(default), armel, arm64, x86"
77
echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
88
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine"
@@ -113,12 +113,12 @@ while :; do
113113
__LinuxCodeName=trusty
114114
fi
115115
;;
116-
xenial) # Ubunry 16.04
116+
xenial) # Ubuntu 16.04
117117
if [ "$__LinuxCodeName" != "jessie" ]; then
118118
__LinuxCodeName=xenial
119119
fi
120120
;;
121-
zesty) # Ununtu 17.04
121+
zesty) # Ubuntu 17.04
122122
if [ "$__LinuxCodeName" != "jessie" ]; then
123123
__LinuxCodeName=zesty
124124
fi
@@ -132,7 +132,16 @@ while :; do
132132
__LinuxCodeName=jessie
133133
__UbuntuRepo="http://ftp.debian.org/debian/"
134134
;;
135-
# TBD Stretch -> Debian 9, Buster -> Debian 10
135+
stretch) # Debian 9
136+
__LinuxCodeName=stretch
137+
__UbuntuRepo="http://ftp.debian.org/debian/"
138+
__LLDB_Package="liblldb-6.0-dev"
139+
;;
140+
buster) # Debian 10
141+
__LinuxCodeName=buster
142+
__UbuntuRepo="http://ftp.debian.org/debian/"
143+
__LLDB_Package="liblldb-6.0-dev"
144+
;;
136145
tizen)
137146
if [ "$__BuildArch" != "armel" ]; then
138147
echo "Tizen is available only for armel."

‎eng/common/darc-init.ps1‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
param (
2-
$darcVersion = $null
2+
$darcVersion = $null,
3+
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
34
)
45

56
$verbosity = "m"
@@ -16,13 +17,13 @@ function InstallDarcCli ($darcVersion) {
1617
Invoke-Expression "& `"$dotnet`" tool uninstall $darcCliPackageName -g"
1718
}
1819

19-
# Until we can anonymously query the BAR API for the latest arcade-services
20-
# build applied to the PROD channel, this is hardcoded.
20+
# If the user didn't explicitly specify the darc version,
21+
# query the Maestro API for the correct version of darc to install.
2122
if (-not $darcVersion) {
22-
$darcVersion = '1.1.0-beta.19205.4'
23+
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
2324
}
2425

25-
$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'
26+
$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json'
2627

2728
Write-Host "Installing Darc CLI version $darcVersion..."
2829
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."

0 commit comments

Comments
 (0)