From 8f6d9e9efc2e14aabdbd40e2ae30c51f50dbc288 Mon Sep 17 00:00:00 2001 From: Alberto Medina Gutierrez Date: Thu, 26 Sep 2019 16:12:23 -0700 Subject: [PATCH 1/2] Make changes for easy transition for .NETCore 3.0 --- source/dotnet/RunAllTests.ps1 | 16 ++++++++-------- source/dotnet/global.json | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 source/dotnet/global.json diff --git a/source/dotnet/RunAllTests.ps1 b/source/dotnet/RunAllTests.ps1 index ef2f7d2561..3f7533f92b 100644 --- a/source/dotnet/RunAllTests.ps1 +++ b/source/dotnet/RunAllTests.ps1 @@ -18,30 +18,30 @@ Write-Host Running HTML tests... Set-Location .\Samples\AdaptiveCards.Sample.Html Write-Host SupportsInteractivity = false... -dotnet run $v1scenariosPath -r -o $testResultsPath\HTML\StandardNonInteractive.html +dotnet run $v1scenariosPath -- -r -o $testResultsPath\HTML\StandardNonInteractive.html Write-Host SupportsInteractivity = true... -dotnet run $v1scenariosPath -r -i -o $testResultsPath\HTML\Standard.html +dotnet run $v1scenariosPath -- -r -i -o $testResultsPath\HTML\Standard.html Write-Host Windows notification config... -dotnet run $v1scenariosPath -r -o $testResultsPath\HTML\WindowsNotification.html --host-config $samplesPath\hostconfig\windows-notification.json +dotnet run $v1scenariosPath -- -r -o $testResultsPath\HTML\WindowsNotification.html --host-config $samplesPath\hostconfig\windows-notification.json Write-Host Timeline config... -dotnet run $v1scenariosPath -r -o $testResultsPath\HTML\WindowsTimeline.html --host-config $samplesPath\hostconfig\windows-timeline.json +dotnet run $v1scenariosPath -- -r -o $testResultsPath\HTML\WindowsTimeline.html --host-config $samplesPath\hostconfig\windows-timeline.json Write-Host Running WPF tests... Set-Location ..\AdaptiveCards.Sample.ImageRender Write-Host SupportsInteractivity = false... -dotnet run $v1scenariosPath -r -o $testResultsPath\WPF\StandardNonInteractive +dotnet run $v1scenariosPath -- -r -o $testResultsPath\WPF\StandardNonInteractive Write-Host SupportsInteractivity = true... -dotnet run $v1scenariosPath -r -i -o $testResultsPath\WPF\Standard +dotnet run $v1scenariosPath -- -r -i -o $testResultsPath\WPF\Standard Write-Host Windows notification config.... -dotnet run $v1scenariosPath -r -o $testResultsPath\WPF\WindowsNotification --host-config $samplesPath\hostconfig\windows-notification.json +dotnet run $v1scenariosPath -- -r -o $testResultsPath\WPF\WindowsNotification --host-config $samplesPath\hostconfig\windows-notification.json Write-Host Timeline config... -dotnet run $v1scenariosPath -r -o $testResultsPath\WPF\WindowsTimeline --host-config $samplesPath\hostconfig\windows-timeline.json +dotnet run $v1scenariosPath -- -r -o $testResultsPath\WPF\WindowsTimeline --host-config $samplesPath\hostconfig\windows-timeline.json Pop-Location \ No newline at end of file diff --git a/source/dotnet/global.json b/source/dotnet/global.json new file mode 100644 index 0000000000..f463b5096f --- /dev/null +++ b/source/dotnet/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "3.0.100-preview6-012264" + } +} \ No newline at end of file From 5ed5635a0d6d64b366d6e35924e5b3b0a663be93 Mon Sep 17 00:00:00 2001 From: Alberto Medina Gutierrez Date: Fri, 18 Oct 2019 15:23:05 -0700 Subject: [PATCH 2/2] Fix NET Core version --- source/dotnet/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dotnet/global.json b/source/dotnet/global.json index f463b5096f..2223a05e31 100644 --- a/source/dotnet/global.json +++ b/source/dotnet/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.0.100-preview6-012264" + "version": "3.0.100" } } \ No newline at end of file