Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (dotnet#47952)
Browse files Browse the repository at this point in the history 
* Update dependencies from https://github.com/dotnet/arcade build 20210205.5

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21101.7 -> To Version 6.0.0-beta.21105.5

* Fix xunit analyzer warning in SharedArrayBufferTests.cs

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Stephen Toub <[email protected]>
  • Loading branch information
@dotnet-maestro @stephentoub
3 people authored Feb 7, 2021
1 parent afd1d33 commit 78ff044
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 56 deletions.
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,69 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21101.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,18 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.8.0</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21101.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21101.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21101.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21101.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21101.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21101.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21101.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21101.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21101.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21101.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21101.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21101.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21105.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21105.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21105.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21105.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21105.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21105.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21105.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21105.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21105.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21105.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21105.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21105.5</MicrosoftDotNetVersionToolsTasksVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
9 changes: 2 additions & 7 deletions eng/common/dotnet-install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,8 @@ while [[ $# > 0 ]]; do
shift
done

# Use uname to determine what the CPU is.
cpuname=$(uname -p)
# Some Linux platforms report unknown for platform, but the arch for machine.
if [[ "$cpuname" == "unknown" ]]; then
cpuname=$(uname -m)
fi

# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
cpuname=$(uname -m)
case $cpuname in
aarch64)
buildarch=arm64
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21101.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21101.7",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21101.7",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21105.5",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.5",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.5",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21101.2",
"Microsoft.Build.NoTargets": "2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion ...ices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/SharedArrayBufferTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public static void SharedArrayBufferSliceAndDice3_SubsetFromTheBackWithEnd(Share
Assert.Equal(12, sliced[1]);
}

private static TheoryData<SharedArrayBuffer> GetTestData(int length)
public static TheoryData<SharedArrayBuffer> GetTestData(int length)
{
// create a SharedArrayBuffer with a size in bytes
SharedArrayBuffer buffer = new SharedArrayBuffer(length);
Expand Down

0 comments on commit 78ff044

Please sign in to comment.