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/windowsdesktop #28897

Merged
merged 16 commits into from
Dec 2, 2022
Merged

[main] Update dependencies from dotnet/windowsdesktop #28897

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
4aaea1a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 4, 2022
5e85f84
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 5, 2022
108716a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 6, 2022
8713c24
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 7, 2022
de15ec2
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 8, 2022
ae6d5f4
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 9, 2022
f27b551
Update VS version.
dreddy-work Nov 21, 2022
d828b2c
Update target framework version.
dreddy-work Nov 21, 2022
85b91a4
Revert target framework change.
dreddy-work Nov 22, 2022
ecba853
Try updating to the next target framework for one test.
marcpopMSFT Nov 23, 2022
573f158
Merge remote-tracking branch 'upstream/main' into darc-main-cba43370-…
rainersigwald Nov 29, 2022
aa5fed9
Update LKG SDK to 8.0.100-alpha.1.22579.5
rainersigwald Nov 29, 2022
c388521
Update the test version of 7.0 installed to 7.0.0
marcpopMSFT Nov 30, 2022
e914c97
Update the short name of NUnit Playwright in approvals
GangWang01 Dec 1, 2022
b0c6d3b
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Dec 2, 2022
93822ea
Fix test by not restoring and avoiding a different error that's more …
marcpopMSFT Dec 2, 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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,25 +134,25 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1771d63827387b49dcd8c33b95f1512f4f11e368</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22552.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22602.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha>
<Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22552.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22602.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha>
<Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22552.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22602.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha>
<Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22552.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22602.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha>
<Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22551.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22601.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>959913ec4f81cc388928fad0c95840bf3ee4962b</Sha>
<Sha>104e539716f681f0f54d35419bc9b1721b2bb02b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22578.10">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22551.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22601.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down
2 changes: 1 addition & 1 deletion eng/restore-toolset.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/restore-toolset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-alpha.1.22556.1",
"dotnet": "8.0.100-alpha.1.22579.5",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
Expand Down
9 changes: 5 additions & 4 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...s/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mstest-playwright
mvc
nugetconfig
nunit
NUnit-playwright
nunit-playwright
nunit-test
page
proto
Expand Down
2 changes: 1 addition & 1 deletion ...sts/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mstest-playwright
mvc
nugetconfig
nunit
NUnit-playwright
nunit-playwright
nunit-test
page
proto
Expand Down
2 changes: 1 addition & 1 deletion ...dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mstest-playwright
mvc
nugetconfig
nunit
NUnit-playwright
nunit-playwright
nunit-test
page
proto
Expand Down
2 changes: 1 addition & 1 deletion .../Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ts/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...pprovals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...t-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...w.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down