From 9ec9fce35e2921ed7f0d107c34400d17b3d59019 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Sun, 25 Oct 2020 19:19:57 -0700 Subject: [PATCH] Update tests for .NET 6 --- .../TestProjects/UseCswinrt/consolecswinrt.csproj | 2 +- src/redist/targets/GenerateBundledVersions.targets | 13 ++++++++----- .../GivenWeWantToRequireWindowsForDesktopApps.cs | 2 +- .../{GivenWindows50App.cs => GivenWindowsApp.cs} | 2 +- .../Assertions/FileInfoAssertions.cs | 11 ----------- 5 files changed, 11 insertions(+), 19 deletions(-) rename test/EndToEnd/{GivenWindows50App.cs => GivenWindowsApp.cs} (97%) diff --git a/TestAssets/TestProjects/UseCswinrt/consolecswinrt.csproj b/TestAssets/TestProjects/UseCswinrt/consolecswinrt.csproj index 9fcbef4ce..85367b5e2 100644 --- a/TestAssets/TestProjects/UseCswinrt/consolecswinrt.csproj +++ b/TestAssets/TestProjects/UseCswinrt/consolecswinrt.csproj @@ -1,7 +1,7 @@ Exe - net5.0 + net6.0 Windows diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 2070043a1..01b904e85 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -29,10 +29,13 @@ <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) + <_NET50DefaultRuntimeFrameworkVersion>5.0.0-rc.2.20475.5 <_NET50RuntimePackVersion>5.0.0-rc.2.20475.5 <_NET50TargetingPackVersion>5.0.0-rc.2.20475.5 + <_WindowsDesktop50DefaultRuntimeFrameworkVersion>5.0.0-rc.2.20475.6 <_WindowsDesktop50RuntimePackVersion>5.0.0-rc.2.20475.6 <_WindowsDesktop50TargetingPackVersion>5.0.0-rc.2.20475.6 + <_AspNet50DefaultRuntimeFrameworkVersion>5.0.0-rc.2.20475.17 <_AspNet50RuntimePackVersion>5.0.0-rc.2.20475.17 <_AspNet50TargetingPackVersion>5.0.0-rc.2.20475.17 @@ -331,7 +334,7 @@ Copyright (c) .NET Foundation. All rights reserved. (this); } - - public AndWhichConstraint HaveLastWriteTimeUtc(string because = "", params object[] reasonArgs) - { - var lastWriteTimeUtc = _fileInfo.LastWriteTimeUtc; - - Execute.Assertion - .ForCondition(lastWriteTimeUtc != null) - .BecauseOf(because, reasonArgs) - .FailWith($"Expected File {_fileInfo.FullName} to have a LastWriteTimeUTC, but it is null."); - return new AndWhichConstraint(this, lastWriteTimeUtc); - } } }