From 3c270a9333bc8c0dfddc8cbf1446f13f284dc2d4 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 7 Feb 2019 15:12:13 -0800 Subject: [PATCH 1/2] Match .Net Core 3.0 Preview 2 version. --- azure-pipelines.yml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ecb47bb..a6371ce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ steps: - task: DotNetCoreInstaller@0 inputs: packageType: 'sdk' - version: '3.0.100-preview-010185' + version: '3.0.100-preview-010184' displayName: Install Dot Net Core SDK 3.0 - task: DotNetCoreCLI@2 @@ -40,7 +40,7 @@ steps: - script: nbgv cloud displayName: Set Version - + - powershell: .\build\Install-WindowsSdkISO.ps1 18298 displayName: Insider SDK diff --git a/global.json b/global.json index 7243322..b055151 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.0.100-preview-010185" + "version": "3.0.100-preview-010184" } } \ No newline at end of file From d783e7a648576c757645e0e57c2117b3b0d9ba8a Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 7 Feb 2019 15:48:17 -0800 Subject: [PATCH 2/2] Updated Windows SDK version and some .Net Core 3.0 dependencies. --- Directory.Build.props | 6 +++--- Directory.Build.targets | 4 ++-- .../Microsoft.Toolkit.Sample.Forms.App.csproj | 6 +++--- Microsoft.Toolkit.Sample.Forms.App/app.manifest | 2 +- .../Microsoft.Toolkit.Sample.Wpf.App.csproj | 6 +++--- Microsoft.Toolkit.Sample.Wpf.App/app.manifest | 2 +- Microsoft.Toolkit.Win32.sln | 6 ++++++ .../UnitTests.WebView.Shared.csproj | 2 +- azure-pipelines.yml | 2 +- 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index cfed400..2408207 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,7 +18,7 @@ $(MSBuildProjectName.Contains('Wpf')) $(MSBuildProjectName.Contains('Forms')) $(MSBuildProjectName.Contains('Sample')) - 18298 + 18327 18226 $(MSBuildThisFileDirectory)bin\nupkg @@ -43,9 +43,9 @@ - /azure-pipelines.yml This also needs to be installed on your local machine. Can do this with PowerShell: - ./build/Install-WindowsSDKISO.ps1 18298 + ./build/Install-WindowsSDKISO.ps1 18327 --> - 10.0.18298.0 + 10.0.18327.0 10.0.18226.0 diff --git a/Directory.Build.targets b/Directory.Build.targets index 1a7953c..6c9e07b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -15,8 +15,8 @@ - - + + diff --git a/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj b/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj index b7d8b92..051d441 100644 --- a/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj +++ b/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj @@ -34,10 +34,10 @@ - - + + - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.18298.0\Windows.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.18327.0\Windows.winmd true false diff --git a/Microsoft.Toolkit.Sample.Forms.App/app.manifest b/Microsoft.Toolkit.Sample.Forms.App/app.manifest index 3be80a4..00d0ac8 100644 --- a/Microsoft.Toolkit.Sample.Forms.App/app.manifest +++ b/Microsoft.Toolkit.Sample.Forms.App/app.manifest @@ -40,7 +40,7 @@ - + diff --git a/Microsoft.Toolkit.Sample.Wpf.App/Microsoft.Toolkit.Sample.Wpf.App.csproj b/Microsoft.Toolkit.Sample.Wpf.App/Microsoft.Toolkit.Sample.Wpf.App.csproj index d9ab61f..a4c805f 100644 --- a/Microsoft.Toolkit.Sample.Wpf.App/Microsoft.Toolkit.Sample.Wpf.App.csproj +++ b/Microsoft.Toolkit.Sample.Wpf.App/Microsoft.Toolkit.Sample.Wpf.App.csproj @@ -11,10 +11,10 @@ - - + + - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.18298.0\Windows.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.18327.0\Windows.winmd true false diff --git a/Microsoft.Toolkit.Sample.Wpf.App/app.manifest b/Microsoft.Toolkit.Sample.Wpf.App/app.manifest index 57cbc3f..4db5c7e 100644 --- a/Microsoft.Toolkit.Sample.Wpf.App/app.manifest +++ b/Microsoft.Toolkit.Sample.Wpf.App/app.manifest @@ -40,7 +40,7 @@ - + diff --git a/Microsoft.Toolkit.Win32.sln b/Microsoft.Toolkit.Win32.sln index 0bd20aa..3be9fd7 100644 --- a/Microsoft.Toolkit.Win32.sln +++ b/Microsoft.Toolkit.Win32.sln @@ -39,6 +39,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Wpf.UI.Co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Sample.Forms.App", "Microsoft.Toolkit.Sample.Forms.App\Microsoft.Toolkit.Sample.Forms.App.csproj", "{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2B59D500-7A53-452F-B0AF-774E0ED98C16}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj b/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj index 01b0d04..6f2a765 100644 --- a/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj +++ b/Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj @@ -49,7 +49,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a6371ce..57ff5ef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,7 +41,7 @@ steps: - script: nbgv cloud displayName: Set Version -- powershell: .\build\Install-WindowsSdkISO.ps1 18298 +- powershell: .\build\Install-WindowsSdkISO.ps1 18327 displayName: Insider SDK - powershell: .\build\build.ps1 -target=Package