github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

This commit adds the possibility to remove the dotnet core 3.0 support, working on Greenshot with Visual Studio 2017. To disable call .\build.ps1 --settings_skippackageversioncheck=true -Target DisableDNC30 and modify the global.json. See README.md

Browse source
This commit is contained in:
Robin 2019-01-14 13:19:21 +01:00
commit b7690f334d
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -212,3 +212,7 @@ ModelManifest.xml
#JetBrains Rider #JetBrains Rider
*.idea *.idea
# Cake tools
tools/*
!tools/packages.config

5
README.md
View file

@ -34,6 +34,11 @@ Quick started for developers
* Open the solution from the src directory in Visual Studio * Open the solution from the src directory in Visual Studio
* Rebuild and start... (you might need to rebuild 2x, looking into this) * Rebuild and start... (you might need to rebuild 2x, looking into this)
If you can't use Visual Studio 2019 (preview) try the following:
* Open a powershell in the directory where you cloned this repo
* Disable dotnet core 3.0 with the following: .\build.ps1 --settings_skippackageversioncheck=true -Target DisableDNC30
* To practically (some encoding issue maintains) undo the previous: .\build.ps1 --settings_skippackageversioncheck=true -Target EnableDNC30
* Change src/global.json to contain the dotnet SDK version you have installed (e.g. 2.1.400)
For users the major changes since 1.2.x are: For users the major changes since 1.2.x are:
* dotnet core 3.0 support (why, read here: https://blogs.msdn.microsoft.com/dotnet/2018/10/04/update-on-net-core-3-0-and-net-framework-4-8/ ) * dotnet core 3.0 support (why, read here: https://blogs.msdn.microsoft.com/dotnet/2018/10/04/update-on-net-core-3-0-and-net-framework-4-8/ )

15
build.cake
View file

@ -2,13 +2,11 @@
#tool "OpenCover" #tool "OpenCover"
#tool "GitVersion.CommandLine" #tool "GitVersion.CommandLine"
#tool "docfx.console" #tool "docfx.console"
#tool "coveralls.net"
#tool "PdbGit" #tool "PdbGit"
// Needed for Cake.Compression, as described here: https://github.com/akordowski/Cake.Compression/issues/3 // Needed for Cake.Compression, as described here: https://github.com/akordowski/Cake.Compression/issues/3
#addin "SharpZipLib" #addin "SharpZipLib"
#addin "Cake.FileHelpers" #addin "Cake.FileHelpers"
#addin "Cake.DocFx" #addin "Cake.DocFx"
#addin "Cake.Coveralls"
#addin "Cake.Compression" #addin "Cake.Compression"
var target = Argument("target", "Build"); var target = Argument("target", "Build");
@ -175,6 +173,19 @@ Task("AssemblyVersion")
} }
}); });
Task("EnableDNC30")
.Does(() =>
{
ReplaceRegexInFiles("./**/*.csproj", "<TargetFrameworks>.*</TargetFrameworks><!-- net471;netcoreapp3.0 -->", "<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>");
ReplaceRegexInFiles("./**/*.csproj", "<Project Sdk=\"MSBuild.Sdk.Extras/1.6.65\"><!-- Microsoft.NET.Sdk.WindowsDesktop -->", "<Project Sdk=\"Microsoft.NET.Sdk.WindowsDesktop\">");
});
Task("DisableDNC30")
.Does(() =>
{
ReplaceRegexInFiles("./**/*.csproj", "<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>", "<TargetFrameworks>net471</TargetFrameworks><!-- net471;netcoreapp3.0 -->");
ReplaceRegexInFiles("./**/*.csproj", "<Project Sdk=\"Microsoft.NET.Sdk.WindowsDesktop\">", "<Project Sdk=\"MSBuild.Sdk.Extras/1.6.65\"><!-- Microsoft.NET.Sdk.WindowsDesktop -->");
});
// Clean all unneeded files, so we build on a clean file system // Clean all unneeded files, so we build on a clean file system
Task("Clean") Task("Clean")

4
src/Directory.Build.props
View file

@ -17,7 +17,9 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<UseWindowsForms>false</UseWindowsForms> <UseWindowsForms>false</UseWindowsForms>
<OsProductName>$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion@ProductName)</OsProductName> <OsProductName>$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion@ProductName)</OsProductName>
<RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers> <!--RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers-->
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<ExtrasEnableWinFormsProjectSetup>false</ExtrasEnableWinFormsProjectSetup>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' != 'Debug' And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))"> <PropertyGroup Condition="'$(Configuration)' != 'Debug' And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">