diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1544f94187eb..38cc9130db09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ https://github.com/dotnet/runtime 320f1e152974b93af36f71ddd7f0599521111206 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/windowsdesktop - 9162860562ca3b6a02d2d5683c12a668058727d8 + 8461d6590a4b96d636037868bd5ac7ee2904dd33 - + https://github.com/dotnet/wpf - 959913ec4f81cc388928fad0c95840bf3ee4962b + 104e539716f681f0f54d35419bc9b1721b2bb02b https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7a00806892b5..ca30ccdec91d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ - 8.0.0-alpha.1.22551.2 + 8.0.0-alpha.1.22601.6 diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 259871b7e72f..d74016895792 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -22,7 +22,7 @@ function InitializeCustomSDKToolset { InstallDotNetSharedFramework "3.1.0" InstallDotNetSharedFramework "5.0.0" InstallDotNetSharedFramework "6.0.0" - InstallDotNetSharedFramework "7.0.0-rc.2.22472.3" + InstallDotNetSharedFramework "7.0.0" CreateBuildEnvScripts InstallNuget diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index efe83bbb8fee..da38088d5906 100644 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -30,7 +30,7 @@ function InitializeCustomSDKToolset { InstallDotNetSharedFramework "3.1.0" InstallDotNetSharedFramework "5.0.0" InstallDotNetSharedFramework "6.0.0" - InstallDotNetSharedFramework "7.0.0-rc.2.22472.3" + InstallDotNetSharedFramework "7.0.0" CreateBuildEnvScript } diff --git a/global.json b/global.json index d1f0463a4eac..2edaced17330 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.22556.1", + "dotnet": "8.0.100-alpha.1.22579.5", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index d45edd463e2c..244c80105494 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -20,12 +20,12 @@ public class GivenThatWeWantToBuildAWindowsDesktopProject : SdkTest public GivenThatWeWantToBuildAWindowsDesktopProject(ITestOutputHelper log) : base(log) {} - [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0-preview-20310-07")] + [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0")] [InlineData("UseWindowsForms")] [InlineData("UseWPF")] public void It_errors_when_missing_windows_target_platform(string propertyName) { - var targetFramework = ToolsetInfo.CurrentTargetFramework; + var targetFramework = ToolsetInfo.NextTargetFramework; TestProject testProject = new TestProject() { Name = "MissingTargetPlatform", @@ -34,17 +34,18 @@ public void It_errors_when_missing_windows_target_platform(string propertyName) testProject.AdditionalProperties[propertyName] = "true"; testProject.AdditionalProperties["TargetPlatformIdentifier"] = "custom"; // Make sure we don't get windows implicitly set as the TPI testProject.AdditionalProperties["TargetPlatformSupported"] = "true"; + testProject.AdditionalProperties["TargetPlatformMoniker"] = "custom,Version="; //Make sure we avoid implicitly setting an invalid TPV var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: propertyName); var buildCommand = new BuildCommand(testAsset); - buildCommand.Execute() + buildCommand.ExecuteWithoutRestore() .Should() .Fail() .And .HaveStdOutContaining("NETSDK1136"); } - [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0-preview-20310-07")] + [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0")] [InlineData("UseWindowsForms")] [InlineData("UseWPF")] public void It_errors_when_missing_transitive_windows_target_platform(string propertyName) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt index 3cf82153a912..5b28af17b7ee 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt @@ -14,7 +14,7 @@ mstest-playwright mvc nugetconfig nunit -NUnit-playwright +nunit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt index 990c6fde5222..538cc359d482 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt @@ -14,7 +14,7 @@ mstest-playwright mvc nugetconfig nunit -NUnit-playwright +nunit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt index 0fe4d7b7a671..3272d8b53741 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt @@ -14,7 +14,7 @@ mstest-playwright mvc nugetconfig nunit -NUnit-playwright +nunit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index f9ae98d4a394..9a81ab25f1fd 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -30,7 +30,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index f9ae98d4a394..9a81ab25f1fd 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -30,7 +30,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 74b40fc33918..9fbdcf2657d2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -30,7 +30,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index cd0c094a73e8..2343f2c52c51 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -26,7 +26,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index cd0c094a73e8..2343f2c52c51 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -26,7 +26,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 72551017d6f3..7433d292bfff 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -26,7 +26,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET