Fixed breaking changes to the dotnet core SDK 3.0 which were introduced here: https://github.com/dotnet/core-sdk/pull/148

2025-08-22 22:34:27 -07:00 · 2018-11-16 09:47:21 +01:00 · 2018-11-16 09:47:21 +01:00 · cd0f67b1a3
commit cd0f67b1a3
parent 720480882a
22 changed files with 46 additions and 45 deletions
--- a/README.md
+++ b/README.md
@ -26,7 +26,8 @@ This repository is work in progress for the next Greenshot (2.0?).

 Quick started for developers
 ----------------------------
-* Download the latest dotnet core SDK from here: https://github.com/dotnet/core-sdk ([quick-link to download](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe))
+* Download the latest (!!!) dotnet core SDK from here: https://github.com/dotnet/core-sdk ([quick-link to download](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe))
+  * Make sure you only have the latest dotnet core 3.0 installed!
 * Make sure you have the latest Visual Studio 2017 (no need for previews), for 15.9.x enable [Use previews of the .NET Core SDK](https://blogs.msdn.microsoft.com/dotnet/2018/11/13/net-core-tooling-update-for-visual-studio-2017-version-15-9/)
 * Clone the [repository](https://github.com/greenshot/greenshot/tree/feature/netcoreapp3.0), branch feature/netcoreapp3.0
 * Open the solution from the src directory in Visual Studio 2017
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@ -44,8 +44,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@ -51,8 +51,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@ -38,8 +38,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
 	<PackageReference Include="CliWrap" Version="2.1.0" />
    <PackageReference Include="Fody" Version="3.2.17">
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
    <PackageReference Include="Fody" Version="3.2.17">
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
    <PackageReference Include="Fody" Version="3.2.17">
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@ -48,8 +48,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@ -133,8 +133,8 @@
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
    <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
--- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
+++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
@ -38,8 +38,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
    <PackageReference Include="Fody" Version="3.2.17">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@ -45,8 +45,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
    <PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
    <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
    <PackageReference Include="Fody" Version="3.2.17">
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@ -46,8 +46,8 @@
  
  <ItemGroup>
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@ -50,8 +50,8 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@ -45,13 +45,13 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="ControlzEx" Version="3.0.2.4" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
-      <Version>1.1.14-g04dc0f1bab</Version>
+      <Version>1.2.2</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
-      <Version>1.1.14-g04dc0f1bab</Version>
+      <Version>1.2.2</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.1.14-g04dc0f1bab</Version>
+      <Version>1.2.2</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.HttpExtensions">
      <Version>0.9.15</Version>
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@ -29,7 +29,7 @@
  
  <ItemGroup>
    <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.1.14-g04dc0f1bab</Version>
+      <Version>1.2.2</Version>
    </PackageReference>
    <PackageReference Include="Svg">
      <Version>2.3.0</Version>
--- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
+++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
@ -65,7 +65,7 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
    <PackageReference Include="System.Memory" Version="4.5.1" />
    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@ -69,14 +69,14 @@
  <ItemGroup>
    <PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
    <PackageReference Include="CommandLineParser" Version="2.3.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@ -80,11 +80,11 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="CommandLineParser" Version="2.3.0" />
    <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.14-g04dc0f1bab" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
    <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />