зеркало из https://github.com/dotnet/diagnostics.git
Update dependencies from https://github.com/dotnet/arcade build 20200817.6 (#1448)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6 - Microsoft.DotNet.RemoteExecutor: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6
This commit is contained in:
Родитель
4e5f4a1d11
Коммит
48f43d37ec
|
@ -4,9 +4,9 @@
|
||||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||||
<Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
|
<Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20411.8">
|
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20417.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
|
<Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SymbolStore" Version="1.0.141001">
|
<Dependency Name="Microsoft.SymbolStore" Version="1.0.141001">
|
||||||
<Uri>https://github.com/dotnet/symstore</Uri>
|
<Uri>https://github.com/dotnet/symstore</Uri>
|
||||||
|
@ -14,9 +14,9 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20411.8">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20417.6">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
|
<Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20412.8">
|
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20412.8">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
<SystemThreadingChannelsVersion>4.7.0</SystemThreadingChannelsVersion>
|
<SystemThreadingChannelsVersion>4.7.0</SystemThreadingChannelsVersion>
|
||||||
<XUnitVersion>2.4.1</XUnitVersion>
|
<XUnitVersion>2.4.1</XUnitVersion>
|
||||||
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
|
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
|
||||||
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20411.8</MicrosoftDotNetRemoteExecutorVersion>
|
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20417.6</MicrosoftDotNetRemoteExecutorVersion>
|
||||||
<cdbsosversion>10.0.18362</cdbsosversion>
|
<cdbsosversion>10.0.18362</cdbsosversion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -19,7 +19,9 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
|
||||||
endif()
|
endif()
|
||||||
elseif(TARGET_ARCH_NAME STREQUAL "arm")
|
elseif(TARGET_ARCH_NAME STREQUAL "arm")
|
||||||
set(CMAKE_SYSTEM_PROCESSOR armv7l)
|
set(CMAKE_SYSTEM_PROCESSOR armv7l)
|
||||||
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
|
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf)
|
||||||
|
set(TOOLCHAIN "armv7-alpine-linux-musleabihf")
|
||||||
|
elseif(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
|
||||||
set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
|
set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
|
||||||
else()
|
else()
|
||||||
set(TOOLCHAIN "arm-linux-gnueabihf")
|
set(TOOLCHAIN "arm-linux-gnueabihf")
|
||||||
|
|
|
@ -39,6 +39,7 @@ parameters:
|
||||||
NetEngLatestChannelId: 2
|
NetEngLatestChannelId: 2
|
||||||
NetEngValidationChannelId: 9
|
NetEngValidationChannelId: 9
|
||||||
NetDev5ChannelId: 131
|
NetDev5ChannelId: 131
|
||||||
|
NetDev6ChannelId: 1296
|
||||||
GeneralTestingChannelId: 529
|
GeneralTestingChannelId: 529
|
||||||
NETCoreToolingDevChannelId: 548
|
NETCoreToolingDevChannelId: 548
|
||||||
NETCoreToolingReleaseChannelId: 549
|
NETCoreToolingReleaseChannelId: 549
|
||||||
|
@ -46,7 +47,6 @@ parameters:
|
||||||
NETCoreExperimentalChannelId: 562
|
NETCoreExperimentalChannelId: 562
|
||||||
NetEngServicesIntChannelId: 678
|
NetEngServicesIntChannelId: 678
|
||||||
NetEngServicesProdChannelId: 679
|
NetEngServicesProdChannelId: 679
|
||||||
Net5Preview7ChannelId: 1065
|
|
||||||
Net5Preview8ChannelId: 1155
|
Net5Preview8ChannelId: 1155
|
||||||
Net5RC1ChannelId: 1157
|
Net5RC1ChannelId: 1157
|
||||||
NetCoreSDK313xxChannelId: 759
|
NetCoreSDK313xxChannelId: 759
|
||||||
|
@ -115,7 +115,7 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
|
||||||
arguments: -PromoteToChannels "$(TargetChannels)"
|
arguments: -PromoteToChannels "$(TargetChannels)"
|
||||||
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
|
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
displayName: NuGet Validation
|
displayName: NuGet Validation
|
||||||
|
@ -276,13 +276,13 @@ stages:
|
||||||
dependsOn: ${{ parameters.publishDependsOn }}
|
dependsOn: ${{ parameters.publishDependsOn }}
|
||||||
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
|
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
|
||||||
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
|
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
|
||||||
stageName: 'Net5_Preview7_Publish'
|
stageName: 'NetCore_Dev6_Publish'
|
||||||
channelName: '.NET 5 Preview 7'
|
channelName: '.NET 6 Dev'
|
||||||
akaMSChannelName: 'net5/preview7'
|
akaMSChannelName: 'net6/dev'
|
||||||
channelId: ${{ parameters.Net5Preview7ChannelId }}
|
channelId: ${{ parameters.NetDev6ChannelId }}
|
||||||
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
|
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
|
||||||
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/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/dotnet6-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
|
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
@ -298,7 +298,7 @@ stages:
|
||||||
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
|
||||||
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
|
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
||||||
dependsOn: ${{ parameters.publishDependsOn }}
|
dependsOn: ${{ parameters.publishDependsOn }}
|
||||||
|
@ -308,9 +308,9 @@ stages:
|
||||||
channelName: '.NET 5 RC 1'
|
channelName: '.NET 5 RC 1'
|
||||||
akaMSChannelName: 'net5/rc1'
|
akaMSChannelName: 'net5/rc1'
|
||||||
channelId: ${{ parameters.Net5RC1ChannelId }}
|
channelId: ${{ parameters.Net5RC1ChannelId }}
|
||||||
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
|
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
|
||||||
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/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/internal/_packaging/dotnet5-internal-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
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
|
|
@ -13,6 +13,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20411.8"
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче