Skip to content

Commit dac4e3f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200213.3 (#19023)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20113.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20113.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20113.3
1 parent e4e387c commit dac4e3f

File tree

7 files changed

+53
-12
lines changed

7 files changed

+53
-12
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,17 +408,17 @@
408408
<Uri>https://github.com/dotnet/extensions</Uri>
409409
<Sha>5fe6ff74c3f95683d21e33cd6bf98e8e1477d6ed</Sha>
410410
</Dependency>
411-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20109.1">
411+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20113.3">
412412
<Uri>https://github.com/dotnet/arcade</Uri>
413-
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
413+
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
414414
</Dependency>
415-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20109.1">
415+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20113.3">
416416
<Uri>https://github.com/dotnet/arcade</Uri>
417-
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
417+
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
418418
</Dependency>
419-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20109.1">
419+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20113.3">
420420
<Uri>https://github.com/dotnet/arcade</Uri>
421-
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
421+
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
422422
</Dependency>
423423
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-preview.1.20112.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
424424
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
-->
6161
<PropertyGroup Label="Automated">
6262
<!-- Packages from dotnet/arcade -->
63-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetGenAPIPackageVersion>
63+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20113.3</MicrosoftDotNetGenAPIPackageVersion>
6464
<!-- Packages from dotnet/roslyn -->
6565
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta3-20111-03</MicrosoftNetCompilersToolsetPackageVersion>
6666
<!-- Packages from dotnet/core-setup -->

‎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/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/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 }

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1",
29-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20109.1"
28+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20113.3",
29+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20113.3"
3030
}
3131
}

0 commit comments

Comments
 (0)