From bde95f9079bdfb1517df4b9eea4fccd5b4062fcb Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Mon, 12 Apr 2021 15:00:42 -0700 Subject: [PATCH 01/11] Add test for checking if the ASP.NET runtime version is the same as .NET SDK --- .../Sdk/tools/dotnet-cli/DotNetCli.props | 3 +- .../aspnet-versioncheck.ps1 | 29 +++++++++++ tests/UnitTests.AspNetCoreRuntimeMatch.proj | 49 +++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 create mode 100644 tests/UnitTests.AspNetCoreRuntimeMatch.proj diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index 0746d3586c4..f8e0924acdb 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -1,10 +1,11 @@ false + 6.0.0-preview.2.21154.6 runtime $(BundledNETCoreAppPackageVersion) - 6.0.0-preview.2.21154.6 + $(AspNetCoreRuntimeVersion) $(NETCoreSdkVersion) Current dotnet-cli diff --git a/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 b/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 new file mode 100644 index 00000000000..206692e94b3 --- /dev/null +++ b/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 @@ -0,0 +1,29 @@ +Param( + [string] $aspNetCoreVersion +) + +$versionRegex = "(?\d+\.\d+)\.\d+(?:-(?\w+\.\d+)\.\d+\.\d+)?" + +$dotnetVersion = & dotnet --version +$dotNetSdkMatch = $dotnetVersion -Match $versionRegex +if ($dotNetSdkMatch -eq $false) { + Write-Host ".NET SDK version '$dotnetVersion' did not match regex!" + exit 1 +} +$dotnetMajorVersion = $Matches.version +$dotnetPreviewVersion = $Matches.preview +Write-Host ".NET SDK '$dotnetVersion' -- major version: '$dotnetMajorVersion'; preview: '$dotnetPreviewVersion'" + +$aspNetCoreMatch = $aspNetCoreVersion -Match $versionRegex +if ($aspNetCoreMatch -eq $false) { + Write-Host "ASP.NET Core Runtime version '$aspNetCoreVersion' did not match regex!" + exit 1 +} +$aspNetCoreMajorVersion = $Matches.version +$aspNetCorePreviewVersion = $Matches.preview +Write-Host "ASP.NET SDK '$aspNetCoreVersion' -- major version: '$aspNetCoreMajorVersion'; preview: '$aspNetCorePreviewVersion'" + +if ($dotnetMajorVersion -ne $aspNetCoreMajorVersion -or $dotnetPreviewVersion -ne $aspNetCorePreviewVersion) { + Write-Host "ASP.NET Core Runtime version and .NET Core Runtime version do not match -- update DotNetCli.props!" + exit 1 +} \ No newline at end of file diff --git a/tests/UnitTests.AspNetCoreRuntimeMatch.proj b/tests/UnitTests.AspNetCoreRuntimeMatch.proj new file mode 100644 index 00000000000..78f9c3334a3 --- /dev/null +++ b/tests/UnitTests.AspNetCoreRuntimeMatch.proj @@ -0,0 +1,49 @@ + + + + + + $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll + $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll + + + + test/product/ + + true + sdk + + $(AGENT_JOBNAME) + + + + + + + + true + $(BUILD_SOURCEVERSIONAUTHOR) + anon + + + + + + + + + msbuild + + + + + + + + + + powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion) + $(MSBuildThisFileDirectory)\ASPNETVersionCheck + + + From a430963584d660ff966c25ee87c0acccd9d23b26 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Mon, 12 Apr 2021 15:06:34 -0700 Subject: [PATCH 02/11] Merge test into UnitTests.proj --- tests/UnitTests.AspNetCoreRuntimeMatch.proj | 49 --------------------- tests/UnitTests.proj | 7 +++ 2 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 tests/UnitTests.AspNetCoreRuntimeMatch.proj diff --git a/tests/UnitTests.AspNetCoreRuntimeMatch.proj b/tests/UnitTests.AspNetCoreRuntimeMatch.proj deleted file mode 100644 index 78f9c3334a3..00000000000 --- a/tests/UnitTests.AspNetCoreRuntimeMatch.proj +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll - $(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll - - - - test/product/ - - true - sdk - - $(AGENT_JOBNAME) - - - - - - - - true - $(BUILD_SOURCEVERSIONAUTHOR) - anon - - - - - - - - - msbuild - - - - - - - - - - powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion) - $(MSBuildThisFileDirectory)\ASPNETVersionCheck - - - diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index b1e35c137b7..2538cca88af 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -100,4 +100,11 @@ + + + + powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion) + $(MSBuildThisFileDirectory)\ASPNETVersionCheck + + From 63f267c65553ac0d19a491f916562195ea21381a Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Mon, 12 Apr 2021 15:26:00 -0700 Subject: [PATCH 03/11] Windows-only the new test --- tests/UnitTests.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index 2538cca88af..daec471e214 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -100,9 +100,9 @@ - + - + powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion) $(MSBuildThisFileDirectory)\ASPNETVersionCheck From 1426f747bce887fa01c8fff30b37b981866d5c4e Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Mon, 12 Apr 2021 15:46:05 -0700 Subject: [PATCH 04/11] Switch to pascal casing, set different exit codes --- tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 | 4 ++-- tests/UnitTests.proj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 b/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 index 206692e94b3..5c754f1f342 100644 --- a/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 +++ b/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 @@ -8,7 +8,7 @@ $dotnetVersion = & dotnet --version $dotNetSdkMatch = $dotnetVersion -Match $versionRegex if ($dotNetSdkMatch -eq $false) { Write-Host ".NET SDK version '$dotnetVersion' did not match regex!" - exit 1 + exit 2 } $dotnetMajorVersion = $Matches.version $dotnetPreviewVersion = $Matches.preview @@ -17,7 +17,7 @@ Write-Host ".NET SDK '$dotnetVersion' -- major version: '$dotnetMajorVersion'; p $aspNetCoreMatch = $aspNetCoreVersion -Match $versionRegex if ($aspNetCoreMatch -eq $false) { Write-Host "ASP.NET Core Runtime version '$aspNetCoreVersion' did not match regex!" - exit 1 + exit 3 } $aspNetCoreMajorVersion = $Matches.version $aspNetCorePreviewVersion = $Matches.preview diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index daec471e214..a5a1a709a07 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -102,9 +102,9 @@ - + powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion) - $(MSBuildThisFileDirectory)\ASPNETVersionCheck + $(MSBuildThisFileDirectory)\AspNetVersionCheck From f79935bd9e89777c61ef21b768e928628f8a5e39 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Tue, 13 Apr 2021 08:31:05 -0700 Subject: [PATCH 05/11] move part 1 --- tests/{ASPNETVersionCheck => }/aspnet-versioncheck.ps1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{ASPNETVersionCheck => }/aspnet-versioncheck.ps1 (100%) diff --git a/tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 b/tests/aspnet-versioncheck.ps1 similarity index 100% rename from tests/ASPNETVersionCheck/aspnet-versioncheck.ps1 rename to tests/aspnet-versioncheck.ps1 From ca5da626d238800c6f6f39f2f90a871b1ce5bdb4 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Tue, 13 Apr 2021 08:31:48 -0700 Subject: [PATCH 06/11] full rename, part 2 --- tests/{ => AspNetVersionCheck}/aspnet-versioncheck.ps1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{ => AspNetVersionCheck}/aspnet-versioncheck.ps1 (100%) diff --git a/tests/aspnet-versioncheck.ps1 b/tests/AspNetVersionCheck/aspnet-versioncheck.ps1 similarity index 100% rename from tests/aspnet-versioncheck.ps1 rename to tests/AspNetVersionCheck/aspnet-versioncheck.ps1 From 20200d6be3b813fae899d688b1e886ebdaf2456a Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Tue, 13 Apr 2021 08:38:35 -0700 Subject: [PATCH 07/11] Refactor msbuild --- .../Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props | 5 +++++ .../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- .../Sdk/tools/xharness-runner/XHarnessRunner.targets | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props new file mode 100644 index 00000000000..07f60643cf5 --- /dev/null +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props @@ -0,0 +1,5 @@ + + + 6.0.0-preview.2.21154.6 + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index f8e0924acdb..4a38512481c 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -1,7 +1,7 @@ + false - 6.0.0-preview.2.21154.6 runtime $(BundledNETCoreAppPackageVersion) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets index 0e31001124d..a4636ad5bd1 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets @@ -1,4 +1,5 @@ + @@ -6,7 +7,7 @@ true aspnetcore-runtime 6.0.100-preview.2.21155.3 - 6.0.0-preview.2.21154.6 + $(AspNetCoreRuntimeVersion) Date: Tue, 13 Apr 2021 08:40:39 -0700 Subject: [PATCH 08/11] whoops --- .../Sdk/tools/xharness-runner/XHarnessRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets index a4636ad5bd1..62557acfd82 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets @@ -1,5 +1,5 @@ - + From 6b6272175c2c6d464424a3e10a93d752eabaa38e Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Tue, 13 Apr 2021 08:45:05 -0700 Subject: [PATCH 09/11] switch to XHarnessRunner.props --- .../Sdk/tools/xharness-runner/XHarnessRunner.props | 1 + .../Sdk/tools/xharness-runner/XHarnessRunner.targets | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props index 1beaf8122f0..3f3a3c1f9a0 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props @@ -1,4 +1,5 @@ + <_XHarnessPackageName>Microsoft.DotNet.XHarness.CLI diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets index 62557acfd82..cd38f7766b3 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets @@ -1,6 +1,4 @@ - - true From b3575d1ed5253fece7ceaacf62272225dafa3f51 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Tue, 13 Apr 2021 08:58:02 -0700 Subject: [PATCH 10/11] Testing --- .../Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props | 5 ----- .../Sdk/tools/dotnet-cli/DotNetCli.props | 1 + .../Sdk/tools/xharness-runner/XHarnessRunner.props | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props deleted file mode 100644 index 07f60643cf5..00000000000 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/AspNetCoreRuntimeVersion.props +++ /dev/null @@ -1,5 +0,0 @@ - - - 6.0.0-preview.2.21154.6 - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index 4a38512481c..6c6d782e926 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -2,6 +2,7 @@ false + 6.0.0-preview.2.21154.6 runtime $(BundledNETCoreAppPackageVersion) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props index 3f3a3c1f9a0..1beaf8122f0 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props @@ -1,5 +1,4 @@ - <_XHarnessPackageName>Microsoft.DotNet.XHarness.CLI From 1077627165a104f6fef9307f46a944e173614c12 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Tue, 13 Apr 2021 09:00:27 -0700 Subject: [PATCH 11/11] oops --- src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index 6c6d782e926..f8e0924acdb 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -1,5 +1,4 @@ - false 6.0.0-preview.2.21154.6