Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/runtime #27406

Merged
merged 16 commits into from
Sep 6, 2022
Merged

[main] Update dependencies from dotnet/runtime #27406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3c637d7
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 24, 2022
e58c862
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 25, 2022
f78debf
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 26, 2022
d6efb7c
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 27, 2022
92aec57
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 28, 2022
ba2c4a8
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 30, 2022
900dfc3
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 31, 2022
0bb3a6d
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 1, 2022
ecabb4d
Don't treat the "cannot load analyzer" warning as an error in the tes…
jkoritzinsky Sep 1, 2022
bd42170
Append to WarningsNotAsErrors
jkoritzinsky Sep 1, 2022
6293323
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 2, 2022
3c73282
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 3, 2022
1564131
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 4, 2022
f3650ca
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-3…
v-wuzhai Sep 5, 2022
9c8f90a
update Blazor assets test
pavelsavara Sep 5, 2022
a4eddd2
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
<Sha>f83b025707502a25ccb48df9893691e5d3cdfbbc</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22426-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -110,30 +110,30 @@
<Sha>f0b2510bfd53a35df0aeae48996d2905c1067022</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22451.5">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>f0b2510bfd53a35df0aeae48996d2905c1067022</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22451.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -280,9 +280,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>00a270bc27455470fac06f5704aa0d7a5a31489d</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22422.24">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22454.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bd4bea62d2c8f87ac8190fc14385b8768500eefd</Sha>
<Sha>75e65e99af5b3c8a2fd0abd5e887f8b14bd45362</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22427.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22431.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22422.24</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22454.3</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22422.24</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22454.3</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22452.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22422.24</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22454.3</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22454.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22454.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22422.24</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22454.3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22454.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22454.3</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down Expand Up @@ -90,10 +90,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22422.24</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22422.24</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22422.24</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22422.24</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22454.3</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22454.3</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22454.3</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22454.3</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
9 changes: 9 additions & 0 deletions src/Assets/TestProjects/WatchNoDepsApp/WatchNoDepsApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
<OutputType>exe</OutputType>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!--
Don't error when generators/analyzers can't be loaded.
This can occur when running tests against FullFramework MSBuild
if the build machine has an MSBuild install with an older version of Roslyn
than the generators in the SDK reference. We aren't testing the generators here
and this failure will occur more clearly in other places when it's
actually an important failure, so don't error out here.
-->
<WarningsNotAsErrors>CS9057</WarningsNotAsErrors>
</PropertyGroup>

</Project>
10 changes: 9 additions & 1 deletion src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public void FilesFromAspNetCoreSharedFrameworkAreNotIncluded()
outputDirectory.Should().NotHaveFile("Microsoft.Extensions.DependencyInjection.Abstractions.dll");
}

[Fact]
[CoreMSBuildOnlyFact]
public void AnalyzersAreConflictResolved()
{
var testProject = new TestProject()
Expand All @@ -248,6 +248,14 @@ public void AnalyzersAreConflictResolved()
project.Root.Add(itemGroup);
itemGroup.Add(new XElement(ns + "EnableNETAnalyzers", "true"));
itemGroup.Add(new XElement(ns + "TreatWarningsAsErrors", "true"));

// Don't error when generators/analyzers can't be loaded.
// This can occur when running tests against FullFramework MSBuild
// if the build machine has an MSBuild install with an older version of Roslyn
// than the generators in the SDK reference. We aren't testing the generators here
// and this failure will occur more clearly in other places when it's
// actually an important failure, so don't error out here.
itemGroup.Add(new XElement(ns + "WarningsNotAsErrors", "CS9057"));
});

var buildCommand = new BuildCommand(testAsset);
Expand Down
11 changes: 10 additions & 1 deletion src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,7 @@ public void ILLink_can_treat_warnings_not_as_errors(string targetFramework)
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);

var testProject = CreateTestProjectWithAnalysisWarnings(targetFramework, projectName);
testProject.AdditionalProperties["WarningsNotAsErrors"] = "IL2026;IL2046;IL2075";
testProject.AdditionalProperties["WarningsNotAsErrors"] += "IL2026;IL2046;IL2075";
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);

var publishCommand = new PublishCommand(testAsset);
Expand Down Expand Up @@ -1744,6 +1744,15 @@ private TestProject CreateTestProjectWithAnalysisWarnings(string targetFramework
TargetFrameworks = targetFramework,
IsExe = isExe
};

// Don't error when generators/analyzers can't be loaded.
// This can occur when running tests against FullFramework MSBuild
// if the build machine has an MSBuild install with an older version of Roslyn
// than the generators in the SDK reference. We aren't testing the generators here
// and this failure will occur more clearly in other places when it's
// actually an important failure, so don't error out here.
// If we're actually testing that we build with no warnings, the test will still fail.
testProject.AdditionalProperties["WarningsNotAsErrors"] = "CS9057;";

testProject.SourceFiles[$"{projectName}.cs"] = @"
using System;
Expand Down
Loading