Skip to content

Commit e83cdbe

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200216.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20116.1
1 parent ce15a91 commit e83cdbe

File tree

9 files changed

+48
-74
lines changed

9 files changed

+48
-74
lines changed

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="5.0.0-beta.20109.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20116.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
8+
<Sha>2086e534f12e6116889ee480646ef54c1f781887</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/cross/toolchain.cmake

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,17 @@ endif()
7171

7272
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
7373
add_compile_options(-mthumb)
74-
add_compile_options(-mfpu=vfpv3)
74+
if (NOT DEFINED CLR_ARM_FPU_TYPE)
75+
set (CLR_ARM_FPU_TYPE vfpv3)
76+
endif (NOT DEFINED CLR_ARM_FPU_TYPE)
77+
78+
add_compile_options (-mfpu=${CLR_ARM_FPU_TYPE})
79+
if (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
80+
set (CLR_ARM_FPU_CAPABILITY 0x7)
81+
endif (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
82+
83+
add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY})
84+
7585
if(TARGET_ARCH_NAME STREQUAL "armel")
7686
add_compile_options(-mfloat-abi=softfp)
7787
if(DEFINED TIZEN_TOOLCHAIN)

eng/common/post-build/darc-gather-drop.ps1

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

eng/common/post-build/nuget-validation.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ param(
99
try {
1010
. $PSScriptRoot\post-build-utils.ps1
1111

12-
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1'
12+
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'
1313

1414
New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
1515

eng/common/templates/post-build/darc-gather-drop.yml

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

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,32 @@ stages:
170170
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
171171
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
172172

173+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
174+
parameters:
175+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
176+
dependsOn: ${{ parameters.publishDependsOn }}
177+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
178+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
179+
stageName: 'Net5_Preview1_Publish'
180+
channelName: '.NET 5 Preview 1'
181+
channelId: 737
182+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
183+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
184+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
185+
186+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
187+
parameters:
188+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
189+
dependsOn: ${{ parameters.publishDependsOn }}
190+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
191+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
192+
stageName: 'Net5_Preview2_Publish'
193+
channelName: '.NET 5 Preview 2'
194+
channelId: 738
195+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
196+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
197+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
198+
173199
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
174200
parameters:
175201
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

eng/common/tools.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,12 @@ function LocateVisualStudio([object]$vsRequirements = $null){
399399
if (!(Test-Path $vsWhereExe)) {
400400
Create-Directory $vsWhereDir
401401
Write-Host 'Downloading vswhere'
402-
Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
402+
try {
403+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
404+
}
405+
catch {
406+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
407+
}
403408
}
404409

405410
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ function GetDotNetInstallScript {
252252

253253
# Use curl if available, otherwise use wget
254254
if command -v curl > /dev/null; then
255-
with_retries curl "$install_script_url" -isSLv --retry 10 --create-dirs -o "$install_script" || {
255+
with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
256256
local exit_code=$?
257257
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
258258
ExitWithExitCode $exit_code

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
}
77
},
88
"msbuild-sdks": {
9-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1"
9+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20116.1"
1010
}
1111
}

0 commit comments

Comments
 (0)