mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[release/6.0.1xx-rc2] Update dependencies from dotnet/sdk (#12000)

Browse source 
[release/6.0.1xx-rc2] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21459.12 to 6.0.0-rtm.21464.18 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21459.13 to 6.0.0-rc.2.21465.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21466.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21460-01 to 17.0.0-preview-21465-01 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.0.0-preview.4.243 to 6.0.0-rc.244 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21460.1 to 0.1.0-alpha.1.21460.1 (parent: Microsoft.NET.Sdk)

 - React to https://github.com/dotnet/templating/issues/3898
This commit is contained in:
dotnet-maestro[bot] 2021-09-16 23:14:23 +00:00 • committed by GitHub
parent 95a9ca67b5
commit 1cb68395e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/EndToEnd/ProjectBuildTests.cs
View file

@ -102,7 +102,7 @@ namespace EndToEnd.Tests
.WithWorkingDirectory(projectDirectory)
.Execute(publishArgs)
.Should().Pass();
var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
.Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
.Sub("win-arm64").Sub("publish");
@ -110,7 +110,7 @@ namespace EndToEnd.Tests
selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly);
selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
}
[WindowsOnlyFact]
public void ItCanPublishArm64Wpf()
{
@ -165,7 +165,7 @@ namespace EndToEnd.Tests
public void DotnetNewShowsCuratedListCorrectly()
{
string locale = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
if (!string.IsNullOrWhiteSpace(locale)
if (!string.IsNullOrWhiteSpace(locale)
&& !locale.StartsWith("en", StringComparison.OrdinalIgnoreCase))
{
Console.WriteLine($"[{nameof(DotnetNewShowsCuratedListCorrectly)}] CurrentUICulture: {locale}");
@ -176,7 +176,7 @@ namespace EndToEnd.Tests
string expectedOutput =
@"[\-\s]+
[\w \.]+webapp,razor\s+\[C#\][\w\ \/]+
[\w \.]+blazorwasm\s+\[C#\][\w\ \/]+
[\w \.]+blazorserver\s+\[C#\][\w\ \/]+
[\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+
[\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+
";
@ -247,7 +247,7 @@ namespace EndToEnd.Tests
/// <summary>
/// The test checks if the template creates the template for correct framework by default.
/// For .NET 6 the templates should create the projects targeting net6.0
/// For .NET 6 the templates should create the projects targeting net6.0
/// </summary>
[Theory]
[InlineData("console")]