Skip to content

Commit

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

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21365.11 -> To Version 6.0.0-beta.21370.12

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

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21370.12 -> To Version 6.0.0-beta.21373.11

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

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21365.11 -> To Version 6.0.0-beta.21376.4

* Remove SNKP and disable CA1416

The former isn't supported anymore, and the latter is wrong (at least in the running code—I didn't check the tests).

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

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21369.3 -> To Version 6.0.0-beta.21377.2

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

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21369.3 -> To Version 6.0.0-beta.21378.2

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

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21369.3 -> To Version 6.0.0-beta.21379.2

* Add comment

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Nathan Mytelka <Forgind@users.noreply.github.com>
Co-authored-by: Roman Konecny <rokonecn@microsoft.com>
  • Loading branch information
4 people authored Aug 2, 2021
1 parent b7eb19b commit aaac00a
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 13 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha />
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21369.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21379.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e97027cf100d2b532adce387e5cb93a373de93c9</Sha>
<Sha>62a8aafffd4c68ef887680f6837abdff906a662c</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-preview.1.107">
Expand All @@ -18,9 +18,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5f124755232afa7b9903d6bdfcaeb47f39c8838e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21369.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21379.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e97027cf100d2b532adce387e5cb93a373de93c9</Sha>
<Sha>62a8aafffd4c68ef887680f6837abdff906a662c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- DotNetCliVersion MUST match the dotnet version in global.json.
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21369.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21379.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.2.21154.6</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNetCompilersToolsetVersion>4.0.0-3.21373.8</MicrosoftNetCompilersToolsetVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/internal/Tools.csproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"allowPrerelease": true
},
"tools": {
"dotnet": "6.0.100-preview.4.21255.9",
"dotnet": "6.0.100-preview.6.21355.2",
"runtimes": {
"dotnet/x64": [
"2.1.7"
Expand All @@ -15,6 +15,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21369.3"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21379.2"
}
}
1 change: 0 additions & 1 deletion src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ public void AssemblyNameWithAllFields()
HashAlgorithm = System.Configuration.Assemblies.AssemblyHashAlgorithm.SHA256,
VersionCompatibility = AssemblyVersionCompatibility.SameMachine,
CodeBase = "C:\\src",
KeyPair = new StrongNameKeyPair(new byte[] { 4, 3, 2, 1 }),
ContentType = AssemblyContentType.WindowsRuntime,
CultureName = "zh-HK",
};
Expand Down
5 changes: 1 addition & 4 deletions src/Shared/AssemblyNameExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ private AssemblyNameExtension(SerializationInfo info, StreamingContext context)
var hashAlgorithm = (System.Configuration.Assemblies.AssemblyHashAlgorithm) info.GetInt32("hashAlg");
var versionCompatibility = (AssemblyVersionCompatibility) info.GetInt32("verCompat");
var codeBase = info.GetString("codebase");
var keyPair = (StrongNameKeyPair) info.GetValue("keypair", typeof(StrongNameKeyPair));

asAssemblyName = new AssemblyName
{
Expand All @@ -160,7 +159,6 @@ private AssemblyNameExtension(SerializationInfo info, StreamingContext context)
HashAlgorithm = hashAlgorithm,
VersionCompatibility = versionCompatibility,
CodeBase = codeBase,
KeyPair = keyPair
};

asAssemblyName.SetPublicKey(publicKey);
Expand Down Expand Up @@ -635,7 +633,7 @@ private static int CompareBaseNamesStringWise(string asString1, string asString2
/// </summary>
internal AssemblyNameExtension Clone()
{
AssemblyNameExtension newExtension = new AssemblyNameExtension();
AssemblyNameExtension newExtension = new();

if (asAssemblyName != null)
{
Expand Down Expand Up @@ -1001,7 +999,6 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)
info.AddValue("hashAlg", asAssemblyName.HashAlgorithm);
info.AddValue("verCompat", asAssemblyName.VersionCompatibility);
info.AddValue("codebase", asAssemblyName.CodeBase);
info.AddValue("keypair", asAssemblyName.KeyPair);
}

info.AddValue("asStr", asString);
Expand Down
4 changes: 4 additions & 0 deletions src/Shared/NativeMethodsShared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,9 @@ internal static bool IsMaxPathLegacyWindows()
}
}

// CA1416 warns about code that can only run on Windows, but we verified we're running on Windows before this.
// This is the most reasonable way to resolve this part because other ways would require ifdef'ing on NET472.
#pragma warning disable CA1416
private static bool IsLongPathsEnabledRegistry()
{
using (RegistryKey fileSystemKey = Registry.LocalMachine.OpenSubKey(WINDOWS_FILE_SYSTEM_REGISTRY_KEY))
Expand All @@ -640,6 +643,7 @@ private static bool IsLongPathsEnabledRegistry()
return fileSystemKey != null && Convert.ToInt32(longPathsEnabledValue) == 1;
}
}
#pragma warning restore CA1416

/// <summary>
/// Cached value for IsUnixLike (this method is called frequently during evaluation).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2493,6 +2493,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path)
};
}

#pragma warning disable CA1416
/// <summary>
/// Registry access delegate. Given a hive and a view, return the registry base key.
/// </summary>
Expand Down Expand Up @@ -2901,6 +2902,7 @@ private static string GetRegistrySubKeyDefaultValue(RegistryKey baseKey, string
Assert.True(false, $"New GetRegistrySubKeyDefaultValue parameters encountered, need to add unittesting support for subKey={subKey}");
return null;
}
#pragma warning restore CA1416

/// <summary>
/// Delegate for System.IO.File.GetLastWriteTime
Expand Down

0 comments on commit aaac00a

Please sign in to comment.