github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgraded to dotnet core 3.0 release

Browse source
This commit is contained in:
Robin Krom 2019-10-06 21:16:23 +02:00
commit 1e8bcad936
19 changed files with 42 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

14
NuGet.Config
View file

@ -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>

13
azure-pipelines.yml
View file

@ -12,16 +12,13 @@ variables:
buildConfiguration: 'Release' buildConfiguration: 'Release'
steps: steps:
- task: DotNetCoreInstaller@0 - task: NuGetToolInstaller@1
displayName: 'Install .NET Core SDK 3.0'
inputs:
version: '3.0.100-rc1-014179'
- task: NuGetToolInstaller@0 - task: UseDotNet@2
displayName: 'Use NuGet 5.2.0' displayName: 'Use .NET Core sdk 3.0'
inputs: inputs:
versionSpec: 5.2.0 packageType: sdk
checkLatest: true version: 3.0.100
- task: NuGetCommand@2 - task: NuGetCommand@2
displayName: NuGet restore displayName: NuGet restore

5
src/Directory.Build.props
View file

@ -9,9 +9,6 @@
<PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl> <PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<Version>1.0.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers> <RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers>
@ -61,7 +58,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))"> <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> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>

2
src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
View file

@ -24,6 +24,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Confluence" Version="0.8.23" /> <PackageReference Include="Dapplo.Confluence" Version="0.9.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
View file

@ -19,6 +19,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CliWrap" Version="2.3.1" /> <PackageReference Include="CliWrap" Version="2.4.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -23,6 +23,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
View file

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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" /> <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup> </ItemGroup>

4
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -20,7 +20,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Jira" Version="0.8.20" /> <PackageReference Include="Dapplo.Jira" Version="0.9.2" />
<PackageReference Include="DynamicData" Version="6.13.1" /> <PackageReference Include="DynamicData" Version="6.13.13" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Jira/JiraMonitor.cs
View file

@ -60,7 +60,7 @@ namespace Greenshot.Addon.Jira
public void Startup() public void Startup()
{ {
// Subscribe the windows events which tell us a title was changed // Subscribe the windows events which tell us a title was changed
_winEventObservable = WinEventHook.WindowTileChangeObservable() _winEventObservable = WinEventHook.WindowTitleChangeObservable()
.Select(info => User32Api.GetText(info.Handle)) .Select(info => User32Api.GetText(info.Handle))
.Where(title => !string.IsNullOrEmpty(title)) .Where(title => !string.IsNullOrEmpty(title))
.Subscribe(MonitorTitleChangeEvent); .Subscribe(MonitorTitleChangeEvent);

2
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -23,6 +23,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -22,6 +22,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0455" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0409" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -18,7 +18,7 @@
</ItemGroup> </ItemGroup>
<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="Microsoft.Windows.SDK.Contracts" />
<TrimmerRootAssembly Include="System.Runtime.WindowsRuntime" /> <TrimmerRootAssembly Include="System.Runtime.WindowsRuntime" />
</ItemGroup> </ItemGroup>

26
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -16,19 +16,19 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.0.3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.1.3" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.0.3" /> <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.1.3" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.0.3" /> <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.1.3" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.0.3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.1.3" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.26" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.10.7" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.26" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.10.7" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.26" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.10.7" />
<PackageReference Include="Dapplo.Windows" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows" Version="0.11.6" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.6" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.6" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows.Icons" Version="0.11.6" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.6" /> <PackageReference Include="gong-wpf-dragdrop" Version="2.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0206" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0223" />
<PackageReference Include="Svg" Version="3.0.49" /> <PackageReference Include="Svg" Version="3.0.49" />
</ItemGroup> </ItemGroup>

2
src/Greenshot.Core/Greenshot.Core.csproj
View file

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Windows.Icons" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows.Icons" Version="0.11.6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -6,10 +6,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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.Log" Version="1.3.26" />
<PackageReference Include="Dapplo.Windows" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows" Version="0.11.6" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.6" />
<PackageReference Include="Svg" Version="3.0.49" /> <PackageReference Include="Svg" Version="3.0.49" />
<PackageReference Include="System.Memory" Version="4.5.3" /> <PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup> </ItemGroup>

3
src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
View file

@ -18,9 +18,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" /> <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="CommandLineParser" Version="2.6.0" /> <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="SharpAvi" Version="2.1.2" />
<PackageReference Include="System.Memory" Version="4.5.3" /> <PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -31,7 +31,7 @@
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" /> <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="CommandLineParser" Version="2.6.0" /> <PackageReference Include="CommandLineParser" Version="2.6.0" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.26" /> <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" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" /> <PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" /> <PackageReference Include="xunit.analyzers" Version="0.10.0" />

12
src/Greenshot/Greenshot.csproj
View file

@ -35,15 +35,15 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.6.0" /> <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.LogFile" Version="1.3.26" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.26" /> <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.26" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.10.6" /> <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.11.6" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.6" /> <PackageReference Include="gong-wpf-dragdrop" Version="2.1.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.5.231" /> <PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
<PackageReference Include="Svg" Version="3.0.49" /> <PackageReference Include="Svg" Version="3.0.49" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="2.3.0-preview" /> <PackageReference Include="Microsoft.AppCenter.Analytics" Version="2.4.0-preview" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="2.3.0-preview" /> <PackageReference Include="Microsoft.AppCenter.Crashes" Version="2.4.0-preview" />
<TrimmerRootAssembly Include="System.Diagnostics.Debug" /> <TrimmerRootAssembly Include="System.Diagnostics.Debug" />
</ItemGroup> </ItemGroup>

2
src/global.json
View file

@ -1,5 +1,5 @@
{ {
"sdk": { "sdk": {
"version": "3.0.100-preview" "version": "3.0.100"
} }
} }