未验证 提交 a2217e81 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

[main] Update dependencies from dotnet/arcade (#1650)

* Update dependencies from https://github.com/dotnet/arcade build 20210901.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21430.1 -> To Version 6.0.0-beta.21451.3

* Fix build by supressing netcoreapp2.1 targeting error and updating contributing doc to include sdk links

* Fix PackageValidation
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: NJose Perez Rodriguez <joperezr@microsoft.com>
上级 dd3dbcc6
......@@ -6,9 +6,9 @@ How to Contribute
## Recommended Software
1. (If building on Windows) - **[Visual Studio 2019](https://visualstudio.microsoft.com/vs/preview/)** (Community, Professional, Enterprise) with the latest updates. This is not required for building the repo, but it will help a lot if the intent is to change the code or add new bindings.
1. **.NET Core SDK** To ensure the install worked, make sure you can call `dotnet` tool from a command prompt. We now require .NET 6 preview versions of the SDKs because of our central infrastructure, you can find the installers per platform here:
- For Windows: [Link to .NET 6 preview installer for Windows](https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100-preview.1.21103.13/dotnet-sdk-6.0.100-preview.1.21103.13-win-x64.exe) **This is important as you won't be able to open projects on Visual Studio if you don't install this machine-wide**
- For Linux: [Link to .NET 6 preview SDK for Linux](https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100-preview.1.21103.13/dotnet-sdk-6.0.100-preview.1.21103.13-linux-x64.tar.gz)
- For OSX: [Link to .NET 6 preview SDK for OSX](https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100-preview.1.21103.13/dotnet-sdk-6.0.100-preview.1.21103.13-osx-x64.tar.gz)
- For Windows: [Link to .NET 6 preview installer for Windows](https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100-rc.1.21430.12/dotnet-sdk-6.0.100-rc.1.21430.12-win-x64.exe) **This is important as you won't be able to open projects on Visual Studio if you don't install this machine-wide**
- For Linux: [Link to .NET 6 preview SDK for Linux](https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100-rc.1.21430.12/dotnet-sdk-6.0.100-rc.1.21430.12-linux-x64.tar.gz)
- For OSX: [Link to .NET 6 preview SDK for OSX](https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100-rc.1.21430.12/dotnet-sdk-6.0.100-rc.1.21430.12-osx-x64.tar.gz)
## Building from the Command Line
......
......@@ -2,7 +2,8 @@
<PropertyGroup>
<!-- This is set to false by default when using the compilers' NuGet package. -->
<UseSharedCompilation>true</UseSharedCompilation>
<!-- Use the inbox compilers that come with the SDK -->
<UseSdkCompilers>true</UseSdkCompilers>
<CompilerVersion>3.11.0</CompilerVersion>
</PropertyGroup>
......
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21430.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21451.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e0260cb677c04cb0244aad7537c33bec4adce422</Sha>
<Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21430.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21451.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e0260cb677c04cb0244aad7537c33bec4adce422</Sha>
<Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21430.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21451.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e0260cb677c04cb0244aad7537c33bec4adce422</Sha>
<Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha>
</Dependency>
</ToolsetDependencies>
<!-- ProductDependencies -->
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MicrosoftDotNetGenAPIPackageVersion>6.0.0-beta.21430.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>6.0.0-beta.21451.3</MicrosoftDotNetGenAPIPackageVersion>
<!-- dotnet/corefx dependencies -->
<SystemDrawingCommonPackageVersion>5.0.2</SystemDrawingCommonPackageVersion>
<SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>
......
......@@ -709,6 +709,15 @@ function MSBuild() {
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
}
if ($ci) {
$env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
$env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
$env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
}
$toolsetBuildProject = InitializeToolset
$basePath = Split-Path -parent $toolsetBuildProject
$possiblePaths = @(
......@@ -717,6 +726,8 @@ function MSBuild() {
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
$selectedPath = $null
foreach ($path in $possiblePaths) {
......
......@@ -417,6 +417,13 @@ function MSBuild {
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
fi
local toolset_dir="${_InitializeToolset%/*}"
......@@ -427,6 +434,8 @@ function MSBuild {
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
if [[ -f $path ]]; then
selectedPath=$path
......
{
"tools": {
"dotnet": "6.0.100-rc.1.21379.2",
"dotnet": "6.0.100-rc.1.21430.12",
"runtimes": {
"dotnet/x64": [
"2.1.25",
......@@ -9,10 +9,10 @@
}
},
"sdk": {
"version": "6.0.100-rc.1.21379.2"
"version": "6.0.100-rc.1.21430.12"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21430.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21430.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21451.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21451.3"
}
}
......@@ -721,4 +721,16 @@
<Right>lib/netcoreapp2.1/Iot.Device.Bindings.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>Windows.Foundation.FoundationContract.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>Windows.Devices.DevicesLowLevelContract.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>Windows.Foundation.UniversalApiContract.dll</Target>
</Suppression>
</Suppressions>
\ No newline at end of file
......@@ -22,4 +22,117 @@
<Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>Windows.Foundation.FoundationContract.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>Windows.Devices.DevicesLowLevelContract.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1002</DiagnosticId>
<Target>Windows.Foundation.UniversalApiContract.dll</Target>
</Suppression>
<Suppression>
<DiagnosticId>CP1003</DiagnosticId>
<Target>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Target>
</Suppression>
<!-- The suppressions below are all related to Enum types which are not currently properly handled by PackageValidation. -->
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Spi.DataFlow</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Spi.DataFlow.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Spi.SpiMode</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Spi.SpiMode.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Gpio.PinChangeEventHandler</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Gpio.PinEventTypes</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.PinEventTypes.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Gpio.PinMode</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.PinMode.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Gpio.PinNumberingScheme</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.PinNumberingScheme.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.PinValue.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.PinValuePair.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.WaitForEventResult.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:System.Device.Gpio.Drivers.RaspberryPi3Driver.AltMode</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:System.Device.Gpio.Drivers.RaspberryPi3Driver.AltMode.#ctor</Target>
<Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
<Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
</Suppression>
</Suppressions>
\ No newline at end of file
......@@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
</PropertyGroup>
<ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册