From cebfd0a919cf038b55a587e681f1ee6c5f72ad7e Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Fri, 23 Aug 2019 11:42:09 -0700 Subject: [PATCH] Updated to .Net Core preview 8. --- Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj | 2 +- .../FunctionalTests/PreLoad/PreLoadTests.cs | 1 - .../UnitTests.WebView.WinForms.csproj | 2 +- .../{FunctionalTests/PreLoad => }/preload.js | 0 azure-pipelines.yml | 2 +- global.json | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) rename Tests/UnitTests.WebView.WinForms/{FunctionalTests/PreLoad => }/preload.js (100%) diff --git a/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj b/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj index 66323b1..923c6d2 100644 --- a/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj +++ b/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj @@ -46,7 +46,7 @@ - + diff --git a/Tests/UnitTests.WebView.WinForms/FunctionalTests/PreLoad/PreLoadTests.cs b/Tests/UnitTests.WebView.WinForms/FunctionalTests/PreLoad/PreLoadTests.cs index f137979..296580c 100644 --- a/Tests/UnitTests.WebView.WinForms/FunctionalTests/PreLoad/PreLoadTests.cs +++ b/Tests/UnitTests.WebView.WinForms/FunctionalTests/PreLoad/PreLoadTests.cs @@ -88,7 +88,6 @@ namespace Microsoft.Toolkit.Win32.UI.Controls.Test.WinForms.WebView.FunctionalTe } [TestClass] - [DeploymentItem("FunctionalTests/PreLoad/preload.js")] public class RelativePreLoadScript : HostFormWebViewContextSpecification { private bool _scriptNotifyCalled; diff --git a/Tests/UnitTests.WebView.WinForms/UnitTests.WebView.WinForms.csproj b/Tests/UnitTests.WebView.WinForms/UnitTests.WebView.WinForms.csproj index d1af87c..71d65ab 100644 --- a/Tests/UnitTests.WebView.WinForms/UnitTests.WebView.WinForms.csproj +++ b/Tests/UnitTests.WebView.WinForms/UnitTests.WebView.WinForms.csproj @@ -89,7 +89,7 @@ PreserveNewest - + PreserveNewest diff --git a/Tests/UnitTests.WebView.WinForms/FunctionalTests/PreLoad/preload.js b/Tests/UnitTests.WebView.WinForms/preload.js similarity index 100% rename from Tests/UnitTests.WebView.WinForms/FunctionalTests/PreLoad/preload.js rename to Tests/UnitTests.WebView.WinForms/preload.js diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 99506b1..a651f4d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ steps: - task: DotNetCoreInstaller@0 inputs: packageType: 'sdk' - version: '3.0.100-preview7-012821' + version: '3.0.100-preview8-013656' displayName: Install Dot Net Core SDK 3.0 - task: DotNetCoreCLI@2 diff --git a/global.json b/global.json index 21eb2bc..fc36fdf 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.0.100-preview7-012821" + "version": "3.0.100-preview8-013656" } } \ No newline at end of file