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
This commit is contained in:
parent
e4e387cd4e
commit
dac4e3ff38
|
|
@ -408,17 +408,17 @@
|
||||||
<Uri>https://github.com/dotnet/extensions</Uri>
|
<Uri>https://github.com/dotnet/extensions</Uri>
|
||||||
<Sha>5fe6ff74c3f95683d21e33cd6bf98e8e1477d6ed</Sha>
|
<Sha>5fe6ff74c3f95683d21e33cd6bf98e8e1477d6ed</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20109.1">
|
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20113.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
|
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20109.1">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20113.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
|
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20109.1">
|
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20113.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
|
<Sha>f50767f96246063f33a6565d318f3adf9058bace</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-preview.1.20112.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
|
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-preview.1.20112.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
|
||||||
<Uri>https://github.com/dotnet/extensions</Uri>
|
<Uri>https://github.com/dotnet/extensions</Uri>
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
-->
|
-->
|
||||||
<PropertyGroup Label="Automated">
|
<PropertyGroup Label="Automated">
|
||||||
<!-- Packages from dotnet/arcade -->
|
<!-- Packages from dotnet/arcade -->
|
||||||
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20109.1</MicrosoftDotNetGenAPIPackageVersion>
|
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20113.3</MicrosoftDotNetGenAPIPackageVersion>
|
||||||
<!-- Packages from dotnet/roslyn -->
|
<!-- Packages from dotnet/roslyn -->
|
||||||
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta3-20111-03</MicrosoftNetCompilersToolsetPackageVersion>
|
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta3-20111-03</MicrosoftNetCompilersToolsetPackageVersion>
|
||||||
<!-- Packages from dotnet/core-setup -->
|
<!-- Packages from dotnet/core-setup -->
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,17 @@ endif()
|
||||||
|
|
||||||
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
|
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
|
||||||
add_compile_options(-mthumb)
|
add_compile_options(-mthumb)
|
||||||
add_compile_options(-mfpu=vfpv3)
|
if (NOT DEFINED CLR_ARM_FPU_TYPE)
|
||||||
|
set (CLR_ARM_FPU_TYPE vfpv3)
|
||||||
|
endif (NOT DEFINED CLR_ARM_FPU_TYPE)
|
||||||
|
|
||||||
|
add_compile_options (-mfpu=${CLR_ARM_FPU_TYPE})
|
||||||
|
if (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
|
||||||
|
set (CLR_ARM_FPU_CAPABILITY 0x7)
|
||||||
|
endif (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
|
||||||
|
|
||||||
|
add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY})
|
||||||
|
|
||||||
if(TARGET_ARCH_NAME STREQUAL "armel")
|
if(TARGET_ARCH_NAME STREQUAL "armel")
|
||||||
add_compile_options(-mfloat-abi=softfp)
|
add_compile_options(-mfloat-abi=softfp)
|
||||||
if(DEFINED TIZEN_TOOLCHAIN)
|
if(DEFINED TIZEN_TOOLCHAIN)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ param(
|
||||||
try {
|
try {
|
||||||
. $PSScriptRoot\post-build-utils.ps1
|
. $PSScriptRoot\post-build-utils.ps1
|
||||||
|
|
||||||
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1'
|
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'
|
||||||
|
|
||||||
New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
|
New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -170,6 +170,32 @@ stages:
|
||||||
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
||||||
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
|
parameters:
|
||||||
|
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
||||||
|
dependsOn: ${{ parameters.publishDependsOn }}
|
||||||
|
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
|
||||||
|
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
|
||||||
|
stageName: 'Net5_Preview1_Publish'
|
||||||
|
channelName: '.NET 5 Preview 1'
|
||||||
|
channelId: 737
|
||||||
|
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
|
||||||
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
||||||
|
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
|
parameters:
|
||||||
|
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
||||||
|
dependsOn: ${{ parameters.publishDependsOn }}
|
||||||
|
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
|
||||||
|
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
|
||||||
|
stageName: 'Net5_Preview2_Publish'
|
||||||
|
channelName: '.NET 5 Preview 2'
|
||||||
|
channelId: 738
|
||||||
|
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
|
||||||
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
||||||
|
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
||||||
|
|
|
||||||
|
|
@ -399,7 +399,12 @@ function LocateVisualStudio([object]$vsRequirements = $null){
|
||||||
if (!(Test-Path $vsWhereExe)) {
|
if (!(Test-Path $vsWhereExe)) {
|
||||||
Create-Directory $vsWhereDir
|
Create-Directory $vsWhereDir
|
||||||
Write-Host 'Downloading vswhere'
|
Write-Host 'Downloading vswhere'
|
||||||
Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
|
try {
|
||||||
|
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
|
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Yarn.MSBuild": "1.15.2",
|
"Yarn.MSBuild": "1.15.2",
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1",
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20113.3",
|
||||||
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20109.1"
|
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20113.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue