From 85e7e3b8960db787e596a08477e7b9d731b7b625 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Wed, 26 Jun 2019 23:34:05 +0200 Subject: [PATCH] Fixing dependencies --- azure-pipelines.yml | 6 +- src/Greenshot-Full.sln | 168 +++++++++--------- .../Greenshot.Addon.Box.csproj | 1 - .../Greenshot.Addon.Confluence.csproj | 3 +- .../Greenshot.Addon.Dropbox.csproj | 1 - .../Greenshot.Addon.ExternalCommand.csproj | 3 +- .../Greenshot.Addon.Flickr.csproj | 1 - .../Greenshot.Addon.GooglePhotos.csproj | 1 - .../Greenshot.Addon.Imgur.csproj | 1 - .../Greenshot.Addon.InternetExplorer.csproj | 20 +-- .../Greenshot.Addon.Jira.csproj | 3 +- .../Greenshot.Addon.LegacyEditor.csproj | 3 +- .../Greenshot.Addon.Lutim.csproj | 1 - .../Greenshot.Addon.Office.csproj | 3 +- .../Greenshot.Addon.OneDrive.csproj | 1 - .../Greenshot.Addon.Photobucket.csproj | 1 - .../Greenshot.Addon.Tfs.csproj | 1 - .../Greenshot.Addon.Win10.csproj | 1 - src/Greenshot.Addons/Greenshot.Addons.csproj | 33 ++-- src/Greenshot.Core/Greenshot.Core.csproj | 3 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 10 +- .../Greenshot.PerformanceTests.csproj | 1 - src/Greenshot.Tests/Greenshot.Tests.csproj | 5 +- src/Greenshot.sln | 8 +- src/Greenshot/Greenshot.csproj | 12 +- src/Greenshot/Startup.cs | 4 + 26 files changed, 130 insertions(+), 165 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7609a7831..f315be540 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,12 +15,12 @@ steps: - task: DotNetCoreInstaller@0 displayName: 'Install .NET Core SDK 3.0' inputs: - version: '3.0.100-preview7-012284' + version: '3.0.100-preview7-012624' - task: NuGetToolInstaller@0 - displayName: 'Use NuGet 5.0.0' + displayName: 'Use NuGet 5.0.2' inputs: - versionSpec: 5.0.0 + versionSpec: 5.0.2 checkLatest: true - task: NuGetCommand@2 diff --git a/src/Greenshot-Full.sln b/src/Greenshot-Full.sln index 876688b5b..9fe774866 100644 --- a/src/Greenshot-Full.sln +++ b/src/Greenshot-Full.sln @@ -71,254 +71,254 @@ Global {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.Build.0 = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x64.ActiveCfg = Debug|x64 - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x64.Build.0 = Debug|x64 + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x64.ActiveCfg = Debug|Any CPU + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x64.Build.0 = Debug|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.ActiveCfg = Debug|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.Build.0 = Debug|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.Build.0 = Release|Any CPU - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x64.ActiveCfg = Release|x64 - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x64.Build.0 = Release|x64 + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x64.ActiveCfg = Release|Any CPU + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x64.Build.0 = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.ActiveCfg = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.Build.0 = Release|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x64.ActiveCfg = Debug|x64 - {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x64.Build.0 = Debug|x64 + {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x64.ActiveCfg = Debug|Any CPU + {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x64.Build.0 = Debug|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.ActiveCfg = Debug|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.Build.0 = Debug|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Any CPU.Build.0 = Release|Any CPU - {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.ActiveCfg = Release|x64 - {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.Build.0 = Release|x64 + {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.ActiveCfg = Release|Any CPU + {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.Build.0 = Release|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.ActiveCfg = Release|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.Build.0 = Release|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.ActiveCfg = Debug|x64 - {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.Build.0 = Debug|x64 + {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.ActiveCfg = Debug|Any CPU + {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.Build.0 = Debug|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.ActiveCfg = Debug|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.Build.0 = Debug|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.Build.0 = Release|Any CPU - {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.ActiveCfg = Release|x64 - {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.Build.0 = Release|x64 + {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.ActiveCfg = Release|Any CPU + {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.Build.0 = Release|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.ActiveCfg = Release|Any CPU {C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.Build.0 = Release|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.ActiveCfg = Debug|x64 - {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.Build.0 = Debug|x64 + {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.ActiveCfg = Debug|Any CPU + {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.Build.0 = Debug|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.ActiveCfg = Debug|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.Build.0 = Debug|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.Build.0 = Release|Any CPU - {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.ActiveCfg = Release|x64 - {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.Build.0 = Release|x64 + {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.ActiveCfg = Release|Any CPU + {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.Build.0 = Release|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.ActiveCfg = Release|Any CPU {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.Build.0 = Release|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.ActiveCfg = Debug|x64 - {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.Build.0 = Debug|x64 + {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.ActiveCfg = Debug|Any CPU + {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.Build.0 = Debug|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.ActiveCfg = Debug|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.Build.0 = Debug|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.ActiveCfg = Release|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.Build.0 = Release|Any CPU - {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.ActiveCfg = Release|x64 - {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.Build.0 = Release|x64 + {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.ActiveCfg = Release|Any CPU + {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.Build.0 = Release|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.ActiveCfg = Release|Any CPU {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.Build.0 = Release|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.ActiveCfg = Debug|x64 - {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.Build.0 = Debug|x64 + {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.ActiveCfg = Debug|Any CPU + {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.Build.0 = Debug|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.ActiveCfg = Release|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.Build.0 = Release|Any CPU - {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.ActiveCfg = Release|x64 - {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.Build.0 = Release|x64 + {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.ActiveCfg = Release|Any CPU + {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.Build.0 = Release|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.Build.0 = Release|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.ActiveCfg = Debug|x64 - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.Build.0 = Debug|x64 + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.ActiveCfg = Debug|Any CPU + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.Build.0 = Debug|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.Build.0 = Release|Any CPU - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.ActiveCfg = Release|x64 - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.Build.0 = Release|x64 + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.ActiveCfg = Release|Any CPU + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.Build.0 = Release|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.Build.0 = Release|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.ActiveCfg = Debug|x64 - {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.Build.0 = Debug|x64 + {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.ActiveCfg = Debug|Any CPU + {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.Build.0 = Debug|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.ActiveCfg = Debug|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.Build.0 = Debug|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.Build.0 = Release|Any CPU - {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.ActiveCfg = Release|x64 - {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.Build.0 = Release|x64 + {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.ActiveCfg = Release|Any CPU + {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.Build.0 = Release|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.ActiveCfg = Release|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.Build.0 = Release|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.ActiveCfg = Debug|x64 - {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.Build.0 = Debug|x64 + {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.ActiveCfg = Debug|Any CPU + {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.Build.0 = Debug|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.ActiveCfg = Debug|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.Build.0 = Debug|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.Build.0 = Release|Any CPU - {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.ActiveCfg = Release|x64 - {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.Build.0 = Release|x64 + {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.ActiveCfg = Release|Any CPU + {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.Build.0 = Release|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.ActiveCfg = Release|Any CPU {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.Build.0 = Release|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.ActiveCfg = Debug|x64 - {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.Build.0 = Debug|x64 + {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.ActiveCfg = Debug|Any CPU + {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.Build.0 = Debug|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.ActiveCfg = Debug|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.Build.0 = Debug|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Any CPU.Build.0 = Release|Any CPU - {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.ActiveCfg = Release|x64 - {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.Build.0 = Release|x64 + {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.ActiveCfg = Release|Any CPU + {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.Build.0 = Release|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.ActiveCfg = Release|Any CPU {92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.Build.0 = Release|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.ActiveCfg = Debug|x64 - {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.Build.0 = Debug|x64 + {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.ActiveCfg = Debug|Any CPU + {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.Build.0 = Debug|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.ActiveCfg = Debug|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.Build.0 = Debug|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.ActiveCfg = Release|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.Build.0 = Release|Any CPU - {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.ActiveCfg = Release|x64 - {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.Build.0 = Release|x64 + {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.ActiveCfg = Release|Any CPU + {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.Build.0 = Release|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.ActiveCfg = Debug|x64 - {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.Build.0 = Debug|x64 + {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.ActiveCfg = Debug|Any CPU + {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.Build.0 = Release|Any CPU - {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.ActiveCfg = Release|x64 - {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.Build.0 = Release|x64 + {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.ActiveCfg = Release|Any CPU + {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.Build.0 = Release|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x86.ActiveCfg = Release|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x86.Build.0 = Release|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.ActiveCfg = Debug|x64 - {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.Build.0 = Debug|x64 + {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.ActiveCfg = Debug|Any CPU + {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.Build.0 = Debug|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x86.ActiveCfg = Debug|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x86.Build.0 = Debug|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|Any CPU.Build.0 = Release|Any CPU - {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.ActiveCfg = Release|x64 - {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.Build.0 = Release|x64 + {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.ActiveCfg = Release|Any CPU + {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.Build.0 = Release|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x86.ActiveCfg = Release|Any CPU {D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x86.Build.0 = Release|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.ActiveCfg = Debug|x64 - {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.Build.0 = Debug|x64 + {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.ActiveCfg = Debug|Any CPU + {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.Build.0 = Debug|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x86.ActiveCfg = Debug|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x86.Build.0 = Debug|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|Any CPU.ActiveCfg = Release|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|Any CPU.Build.0 = Release|Any CPU - {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x64.ActiveCfg = Release|x64 - {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x64.Build.0 = Release|x64 + {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x64.ActiveCfg = Release|Any CPU + {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x64.Build.0 = Release|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x86.ActiveCfg = Release|Any CPU {F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x86.Build.0 = Release|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x64.ActiveCfg = Debug|x64 - {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x64.Build.0 = Debug|x64 + {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x64.ActiveCfg = Debug|Any CPU + {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x64.Build.0 = Debug|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x86.ActiveCfg = Debug|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x86.Build.0 = Debug|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|Any CPU.Build.0 = Release|Any CPU - {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x64.ActiveCfg = Release|x64 - {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x64.Build.0 = Release|x64 + {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x64.ActiveCfg = Release|Any CPU + {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x64.Build.0 = Release|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x86.ActiveCfg = Release|Any CPU {5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x86.Build.0 = Release|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x64.ActiveCfg = Debug|x64 - {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x64.Build.0 = Debug|x64 + {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x64.ActiveCfg = Debug|Any CPU + {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x64.Build.0 = Debug|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x86.ActiveCfg = Debug|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x86.Build.0 = Debug|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|Any CPU.Build.0 = Release|Any CPU - {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x64.ActiveCfg = Release|x64 - {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x64.Build.0 = Release|x64 + {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x64.ActiveCfg = Release|Any CPU + {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x64.Build.0 = Release|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x86.ActiveCfg = Release|Any CPU {9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x86.Build.0 = Release|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x64.ActiveCfg = Debug|x64 - {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x64.Build.0 = Debug|x64 + {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x64.ActiveCfg = Debug|Any CPU + {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x64.Build.0 = Debug|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x86.ActiveCfg = Debug|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x86.Build.0 = Debug|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|Any CPU.Build.0 = Release|Any CPU - {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.ActiveCfg = Release|x64 - {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.Build.0 = Release|x64 + {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.ActiveCfg = Release|Any CPU + {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.Build.0 = Release|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x86.ActiveCfg = Release|Any CPU {9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x86.Build.0 = Release|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.ActiveCfg = Debug|x64 - {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.Build.0 = Debug|x64 + {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.ActiveCfg = Debug|Any CPU + {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.Build.0 = Debug|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x86.ActiveCfg = Debug|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x86.Build.0 = Debug|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|Any CPU.Build.0 = Release|Any CPU - {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.ActiveCfg = Release|x64 - {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.Build.0 = Release|x64 + {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.ActiveCfg = Release|Any CPU + {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.Build.0 = Release|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x86.ActiveCfg = Release|Any CPU {B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x86.Build.0 = Release|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.ActiveCfg = Debug|x64 - {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.Build.0 = Debug|x64 + {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.ActiveCfg = Debug|Any CPU + {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.Build.0 = Debug|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x86.ActiveCfg = Debug|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x86.Build.0 = Debug|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|Any CPU.Build.0 = Release|Any CPU - {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.ActiveCfg = Release|x64 - {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.Build.0 = Release|x64 + {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.ActiveCfg = Release|Any CPU + {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.Build.0 = Release|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x86.ActiveCfg = Release|Any CPU {8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x86.Build.0 = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.ActiveCfg = Debug|x64 - {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.Build.0 = Debug|x64 + {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.ActiveCfg = Debug|Any CPU + {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.Build.0 = Debug|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x86.ActiveCfg = Debug|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x86.Build.0 = Debug|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.Build.0 = Release|Any CPU - {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x64.ActiveCfg = Release|x64 - {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x64.Build.0 = Release|x64 + {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x64.ActiveCfg = Release|Any CPU + {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x64.Build.0 = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.ActiveCfg = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.Build.0 = Release|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x64.ActiveCfg = Debug|x64 - {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x64.Build.0 = Debug|x64 + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x64.ActiveCfg = Debug|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x64.Build.0 = Debug|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.ActiveCfg = Debug|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.Build.0 = Debug|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.ActiveCfg = Release|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.Build.0 = Release|Any CPU - {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.ActiveCfg = Release|x64 - {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.Build.0 = Release|x64 + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.ActiveCfg = Release|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.Build.0 = Release|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.ActiveCfg = Release|Any CPU {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index be154051a..9522ed335 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Box Greenshot.Addon.Box netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 7164de525..858108bd1 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Confluence Greenshot.Addon.Confluence netcoreapp3.0 - AnyCPU;x64 @@ -26,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index eb080c97c..6ee14ff26 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Dropbox Greenshot.Addon.Dropbox netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 4e4d05642..3baea6c4a 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.ExternalCommand Greenshot.Addon.ExternalCommand netcoreapp3.0 - AnyCPU;x64 @@ -20,7 +19,7 @@ - + all diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index ebddcca36..412a0d356 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Flickr Greenshot.Addon.Flickr netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 9d2df7288..2bb8849c1 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.GooglePhotos Greenshot.Addon.GooglePhotos netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 742a869c5..c2eaf8de1 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Imgur Greenshot.Addon.Imgur netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index a72c3ab9a..c1c2c624c 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -3,28 +3,16 @@ netcoreapp3.0 true - AnyCPU;x64 - - 0.8.33 - + - - {5b924697-4dcd-4f98-85f1-105cb84b7341} - Greenshot.Addons - - - {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} - Greenshot.Core - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 5c9c404d0..c03ec28f2 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Jira Greenshot.Addon.Jira netcoreapp3.0 - AnyCPU;x64 @@ -22,7 +21,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 908de6233..8917c1cfa 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -5,7 +5,6 @@ Greenshot.Addon.LegacyEditor netcoreapp3.0 true - AnyCPU;x64 @@ -110,7 +109,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 983707944..5263f0db5 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Lutim Greenshot.Addon.Lutim netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index d7092b363..45b8a17a1 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Office Greenshot.Addon.Office netcoreapp3.0 - AnyCPU;x64 @@ -19,7 +18,7 @@ - + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index d683b7135..317a4060b 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.OneDrive Greenshot.Addon.OneDrive netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index c6b8c8a9b..a2c1cb4f9 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Photobucket Greenshot.Addon.Photobucket netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index c4e1dc5ee..74da46f19 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Tfs Greenshot.Addon.Tfs netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 3668214cd..be960c6ad 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -4,7 +4,6 @@ Greenshot.Addon.Win10 Greenshot.Addon.Win10 netcoreapp3.0 - AnyCPU;x64 diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 292dcb0fd..1b8037f4e 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -3,7 +3,6 @@ netcoreapp3.0 true - AnyCPU;x64 @@ -18,17 +17,17 @@ - - - - - - - - - - - + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers @@ -38,14 +37,8 @@ - - {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} - Greenshot.Core - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - + + \ No newline at end of file diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 902922bd1..868bcbfc3 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -3,11 +3,10 @@ netcoreapp3.0 true - AnyCPU;x64 - + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index fbb179b94..a2a1698b2 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -3,15 +3,13 @@ netcoreapp3.0 true - 8 - AnyCPU;x64 - - - - + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 89f01be5e..696ba9da4 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -6,7 +6,6 @@ Exe netcoreapp3.0 true - AnyCPU;x64 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index d314f2f34..7664d6f90 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -3,7 +3,6 @@ netcoreapp3.0 true - AnyCPU;x64 @@ -31,8 +30,8 @@ - - + + diff --git a/src/Greenshot.sln b/src/Greenshot.sln index 7e6cc71ad..197737aa3 100644 --- a/src/Greenshot.sln +++ b/src/Greenshot.sln @@ -37,14 +37,14 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x64.ActiveCfg = Debug|x64 - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x64.Build.0 = Debug|x64 + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x64.ActiveCfg = Debug|Any CPU + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x64.Build.0 = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.ActiveCfg = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.Build.0 = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.ActiveCfg = Release|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.Build.0 = Release|Any CPU - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x64.ActiveCfg = Release|x64 - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x64.Build.0 = Release|x64 + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x64.ActiveCfg = Release|Any CPU + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x64.Build.0 = Release|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.ActiveCfg = Release|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.Build.0 = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 81e0419f3..0ea63d756 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -34,17 +34,17 @@ - + - - - - + + + + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index 96479c434..5de4b2eb9 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -34,6 +34,8 @@ using Dapplo.Config.Language; using Dapplo.Log; #if DEBUG using Dapplo.Log.Loggers; +#else +using Dapplo.Log.LogFile; #endif using Dapplo.Utils; using Dapplo.Windows.Common.Structs; @@ -65,6 +67,8 @@ namespace Greenshot #if DEBUG // Initialize a debug logger for Dapplo packages LogSettings.RegisterDefaultLogger(LogLevels.Debug); +#else + LogSettings.RegisterDefaultLogger(LogLevels.Debug); #endif var applicationConfig = ApplicationConfigBuilder .Create()