From 3513de883418871df794dc4e9049e3f9603ad919 Mon Sep 17 00:00:00 2001 From: Michael Scrivo Date: Sat, 12 Sep 2020 16:08:10 -0400 Subject: [PATCH] Update to .net core 3.1.8 --- OutlookDesktop.sln | 5 +---- Setup Script.iss | 8 ++++---- azure-pipelines.yml | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/OutlookDesktop.sln b/OutlookDesktop.sln index cee67df..c5e9c59 100644 --- a/OutlookDesktop.sln +++ b/OutlookDesktop.sln @@ -6,6 +6,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OotD.x64", "OotD.x64\OotD.x EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Global", "Global", "{07B2D199-0589-433B-8C1F-A8B3BF22D4E0}" ProjectSection(SolutionItems) = preProject + azure-pipelines.yml = azure-pipelines.yml LICENSE = LICENSE ServerStaging\ootdAppcast.xml = ServerStaging\ootdAppcast.xml ServerStaging\ootdReleaseNotes.md = ServerStaging\ootdReleaseNotes.md @@ -44,10 +45,6 @@ Global {38490DB9-CF42-4280-BE5B-01CDB8797EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU {38490DB9-CF42-4280-BE5B-01CDB8797EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU {38490DB9-CF42-4280-BE5B-01CDB8797EDD}.Release|Any CPU.Build.0 = Release|Any CPU - {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Debug|Any CPU.ActiveCfg = Debug|x86 - {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Debug|Any CPU.Build.0 = Debug|x86 - {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Release|Any CPU.ActiveCfg = Release|x86 - {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Release|Any CPU.Build.0 = Release|x86 {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CE51416-D856-44D8-969E-AB9FEE70E27F}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Setup Script.iss b/Setup Script.iss index 03d1d4a..496ebf7 100644 --- a/Setup Script.iss +++ b/Setup Script.iss @@ -93,10 +93,10 @@ Filename: "schtasks"; Parameters: "/DELETE /F /TN ""Outlook on the Desktop"""; F [Code] const - dotnetCore3x64DesktopUrl = 'https://download.visualstudio.microsoft.com/download/pr/5e4695fb-da51-4fa8-a090-07a64480888c/65aa842670d2280b5d05b8a070a9f495/windowsdesktop-runtime-3.1.7-win-x64.exe'; - dotnetCore3x86DesktopUrl = 'https://download.visualstudio.microsoft.com/download/pr/3e6c8a13-9d89-4991-b683-b6bb279bc096/d1c44ba0c34f2be8878c36d27287e1a5/windowsdesktop-runtime-3.1.7-win-x86.exe'; - dotnetCore3x64DesktopFilename = 'windowsdesktop-runtime-3.1.7-win-x64.exe'; - dotnetCore3x86DesktopFilename = 'windowsdesktop-runtime-3.1.7-win-x86.exe'; + dotnetCore3x64DesktopUrl = 'https://download.visualstudio.microsoft.com/download/pr/add2ffbe-a288-4d47-8b09-a39c8645f505/8516700dd5bd85fe07e8010e55d8f653/windowsdesktop-runtime-3.1.8-win-x64.exe'; + dotnetCore3x86DesktopUrl = 'https://download.visualstudio.microsoft.com/download/pr/712f4ec2-79a4-4897-af5b-6c814dd49741/2025ef17bfc218cce1699787352d84b8/windowsdesktop-runtime-3.1.8-win-x86.exe'; + dotnetCore3x64DesktopFilename = 'windowsdesktop-runtime-3.1.8-win-x64.exe'; + dotnetCore3x86DesktopFilename = 'windowsdesktop-runtime-3.1.8-win-x86.exe'; procedure InitializeWizard; begin diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7727a0a..a96d228 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ steps: - task: UseDotNet@2 inputs: packageType: 'sdk' - version: '3.1.401' + version: '3.1.402' includePreviewVersions: true - task: DotNetCoreCLI@2