Upgraded to dotnet core 3.0 release

2025-08-22 22:34:27 -07:00 · 2019-10-06 21:16:23 +02:00 · 2019-10-06 21:16:23 +02:00 · 1e8bcad936
commit 1e8bcad936
parent 28fea0b8a8
19 changed files with 42 additions and 63 deletions
--- a/NuGet.Config
+++ b/NuGet.Config
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nugetv3" value="https://api.nuget.org/v3/index.json" />
-    <add key="uwpcommunitytoolkit" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
-    <add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
-    <add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
-    <add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
-    <add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
-    <add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
-  </packageSources>
-</configuration>
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -12,16 +12,13 @@ variables:
  buildConfiguration: 'Release'

 steps:
- task: DotNetCoreInstaller@0
-  displayName: 'Install .NET Core SDK 3.0'
-  inputs:
-    version: '3.0.100-rc1-014179'
+- task: NuGetToolInstaller@1

- task: NuGetToolInstaller@0
-  displayName: 'Use NuGet 5.2.0'
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 3.0'
  inputs:
-    versionSpec: 5.2.0
-    checkLatest: true
+    packageType: sdk
+    version: 3.0.100

 - task: NuGetCommand@2
  displayName: NuGet restore
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -9,9 +9,6 @@
    <PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl>
    <LangVersion>latest</LangVersion>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <Version>1.0.0</Version>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
-    <FileVersion>1.0.0</FileVersion>
    <UseWPF>true</UseWPF>
    <UseWindowsForms>true</UseWindowsForms>
    <RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers>
@ -61,7 +58,7 @@
  </PropertyGroup>

  <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.26">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@ -24,6 +24,6 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dapplo.Confluence" Version="0.8.23" />
+    <PackageReference Include="Dapplo.Confluence" Version="0.9.2" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@ -19,6 +19,6 @@
  </ItemGroup>
  
  <ItemGroup>
-	<PackageReference Include="CliWrap" Version="2.3.1" />
+	<PackageReference Include="CliWrap" Version="2.4.0" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@ -23,6 +23,6 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" />
+    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
+++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dapplo.Windows.Com" Version="0.10.6" />
+    <PackageReference Include="Dapplo.Windows.Com" Version="0.11.6" />
    <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
  </ItemGroup>
  
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@ -20,7 +20,7 @@
  </ItemGroup>
  
  <ItemGroup>
-	<PackageReference Include="Dapplo.Jira" Version="0.8.20" />
-	<PackageReference Include="DynamicData" Version="6.13.1" />
+	<PackageReference Include="Dapplo.Jira" Version="0.9.2" />
+	<PackageReference Include="DynamicData" Version="6.13.13" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addon.Jira/JiraMonitor.cs
+++ b/src/Greenshot.Addon.Jira/JiraMonitor.cs
@ -60,7 +60,7 @@ namespace Greenshot.Addon.Jira
 	    public void Startup()
 	    {
            // Subscribe the windows events which tell us a title was changed
-	        _winEventObservable = WinEventHook.WindowTileChangeObservable()
+	        _winEventObservable = WinEventHook.WindowTitleChangeObservable()
 	            .Select(info => User32Api.GetText(info.Handle))
 	            .Where(title => !string.IsNullOrEmpty(title))
 	            .Subscribe(MonitorTitleChangeEvent);
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@ -23,6 +23,6 @@
  </ItemGroup>
  
  <ItemGroup>
-	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" />
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@ -22,6 +22,6 @@
  </ItemGroup>
  
  <ItemGroup>
-	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" />
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@ -18,7 +18,7 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
 	<TrimmerRootAssembly Include="Microsoft.Windows.SDK.Contracts" />
 	<TrimmerRootAssembly Include="System.Runtime.WindowsRuntime" />
  </ItemGroup>
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@ -16,19 +16,19 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.0.3" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.0.3" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.0.3" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.0.3" />
-    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.26" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.26" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.26" />
-    <PackageReference Include="Dapplo.Windows" Version="0.10.6" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.10.6" />
-    <PackageReference Include="Dapplo.Windows.Dpi" Version="0.10.6" />
-    <PackageReference Include="Dapplo.Windows.Icons" Version="0.10.6" />
-    <PackageReference Include="gong-wpf-dragdrop" Version="2.0.6" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0206" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.1.3" />
+    <PackageReference Include="Dapplo.HttpExtensions" Version="0.10.7" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.10.7" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.10.7" />
+    <PackageReference Include="Dapplo.Windows" Version="0.11.6" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.6" />
+    <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.6" />
+    <PackageReference Include="Dapplo.Windows.Icons" Version="0.11.6" />
+    <PackageReference Include="gong-wpf-dragdrop" Version="2.1.0" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0223" />
    <PackageReference Include="Svg" Version="3.0.49" />
  </ItemGroup>

--- a/src/Greenshot.Core/Greenshot.Core.csproj
+++ b/src/Greenshot.Core/Greenshot.Core.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Dapplo.Windows.Icons" Version="0.10.6" />
+    <PackageReference Include="Dapplo.Windows.Icons" Version="0.11.6" />
  </ItemGroup>

  <ItemGroup>
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@ -6,10 +6,10 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dapplo.Addons" Version="1.2.17" />
+    <PackageReference Include="Dapplo.Addons" Version="1.3.3" />
    <PackageReference Include="Dapplo.Log" Version="1.3.26" />
-    <PackageReference Include="Dapplo.Windows" Version="0.10.6" />
-    <PackageReference Include="Dapplo.Windows.Dpi" Version="0.10.6" />
+    <PackageReference Include="Dapplo.Windows" Version="0.11.6" />
+    <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.6" />
    <PackageReference Include="Svg" Version="3.0.49" />
    <PackageReference Include="System.Memory" Version="4.5.3" />
  </ItemGroup>
--- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
+++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
@ -18,9 +18,8 @@
  <ItemGroup>
    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
    <PackageReference Include="CommandLineParser" Version="2.6.0" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0" />
    <PackageReference Include="SharpAvi" Version="2.1.2" />
    <PackageReference Include="System.Memory" Version="4.5.3" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
  </ItemGroup>
 </Project>
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@ -31,7 +31,7 @@
    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
    <PackageReference Include="CommandLineParser" Version="2.6.0" />
    <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.26" />
-    <PackageReference Include="Dapplo.Windows" Version="0.10.6" />
+    <PackageReference Include="Dapplo.Windows" Version="0.11.6" />
    <PackageReference Include="xunit" Version="2.4.1" />
    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
    <PackageReference Include="xunit.analyzers" Version="0.10.0" />
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@ -35,15 +35,15 @@

  <ItemGroup>
    <PackageReference Include="CommandLineParser" Version="2.6.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.0.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.1.3" />
    <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.26" />
    <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.26" />
-    <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.10.6" />
-    <PackageReference Include="gong-wpf-dragdrop" Version="2.0.6" />
-    <PackageReference Include="sqlite-net-pcl" Version="1.5.231" />
+    <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.11.6" />
+    <PackageReference Include="gong-wpf-dragdrop" Version="2.1.0" />
+    <PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
    <PackageReference Include="Svg" Version="3.0.49" />
-    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="2.3.0-preview" />
-    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="2.3.0-preview" />
+    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="2.4.0-preview" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="2.4.0-preview" />
    <TrimmerRootAssembly Include="System.Diagnostics.Debug" />
  </ItemGroup>
  
--- a/src/global.json
+++ b/src/global.json
@ -1,5 +1,5 @@
 {
    "sdk": {
-        "version": "3.0.100-preview"
+        "version": "3.0.100"
    }    
 }