Skip to content

Commit a599706

Browse files
dotnet-maestro[bot]brettfo
dotnet-maestro[bot]
and
brettfo
committed
[master] Update dependencies from dotnet/arcade (#763)
* Update dependencies from https://github.com/dotnet/arcade build 20200124.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20074.2 * fix nuget.config * upgrade executables to netcoreapp3.1 * fix test expected error message Co-authored-by: Brett V. Forsgren <[email protected]>
1 parent 5291fc2 commit a599706

File tree

20 files changed

+94
-29
lines changed

20 files changed

+94
-29
lines changed

‎NuGet.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->->
3+
<!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
44
<packageSources>
5+
<clear />
6+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
57
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
68
</packageSources>
79
</configuration>

‎eng/Version.Details.xml

Lines changed: 3 additions & 3 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.19258.5">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20074.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>9005cee9510d23535c09bd9b6be7c426e526c067</Sha>
8+
<Sha>75c2e2ef83c611aa2c4ad04f8c55bca5a3dc741d</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
11-
</Dependencies>
11+
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
<VersionPrefix>2.0.0</VersionPrefix>
1010
<PreReleaseVersionLabel>beta1</PreReleaseVersionLabel>
1111
</PropertyGroup>
12-
1312
<PropertyGroup>
1413
<UsingToolSourceLink>true</UsingToolSourceLink>
1514
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1615
<PublishWindowsPdb>true</PublishWindowsPdb>
1716
</PropertyGroup>
18-
19-
<!-- <PropertyGroup>
17+
<!-- <PropertyGroup>
2018
<FluentAssertionsVersion>4.18.0</FluentAssertionsVersion>
2119
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
2220
<SystemNetHttpVersion>4.3.1</SystemNetHttpVersion>

‎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: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ __UbuntuPackages="build-essential"
2525
__AlpinePackages="alpine-base"
2626
__AlpinePackages+=" build-base"
2727
__AlpinePackages+=" linux-headers"
28-
__AlpinePackages+=" lldb-dev"
29-
__AlpinePackages+=" llvm-dev"
28+
__AlpinePackagesEdgeTesting=" lldb-dev"
29+
__AlpinePackagesEdgeMain=" llvm9-libs"
30+
__AlpinePackagesEdgeMain+=" python3"
3031

3132
# symlinks fixer
3233
__UbuntuPackages+=" symlinks"
@@ -199,13 +200,23 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then
199200
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
200201
mkdir -p $__RootfsDir/usr/bin
201202
cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin
203+
202204
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
203205
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
204206
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
205-
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
206-
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
207207
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
208208
add $__AlpinePackages
209+
210+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
211+
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
212+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
213+
add $__AlpinePackagesEdgeMain
214+
215+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
216+
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
217+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
218+
add $__AlpinePackagesEdgeTesting
219+
209220
rm -r $__ApkToolsDir
210221
elif [[ -n $__LinuxCodeName ]]; then
211222
qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo

‎eng/common/enable-cross-org-publishing.ps1

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ param(
22
[string] $token
33
)
44

5+
56
. $PSScriptRoot\pipeline-logging-functions.ps1
67

7-
Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token
8-
Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/'
8+
# Write-PipelineSetVariable will no-op if a variable named $ci is not defined
9+
# Since this script is only ever called in AzDO builds, just universally set it
10+
$ci = $true
11+
12+
Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token -IsMultiJobVariable $false
13+
Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/' -IsMultiJobVariable $false

‎eng/common/templates/post-build/post-build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,29 @@ stages:
221221
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
222222
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
223223
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
224+
225+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
226+
parameters:
227+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
228+
dependsOn: ${{ parameters.publishDependsOn }}
229+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
230+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
231+
stageName: 'Net_Eng_Services_Int_Publish'
232+
channelName: '.NET Eng Services - Int'
233+
channelId: 678
234+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
235+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
236+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
237+
238+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
239+
parameters:
240+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
241+
dependsOn: ${{ parameters.publishDependsOn }}
242+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
243+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
244+
stageName: 'Net_Eng_Services_Prod_Publish'
245+
channelName: '.NET Eng Services - Prod'
246+
channelId: 679
247+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
248+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
249+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"tools": {
3-
"dotnet": "2.1.607",
3+
"dotnet": "3.1.100",
44
"vs": {
55
"version": "16.0"
66
}
77
},
88
"msbuild-sdks": {
9-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19258.5"
9+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20074.2"
1010
}
11-
}
11+
}

‎samples/DragonFruit/DragonFruit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
</PropertyGroup>
88

0 commit comments

Comments
 (0)