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

Starting to get the configuration working, application now starts (net471)

Browse source
This commit is contained in:
Robin 2018-11-05 08:50:06 +01:00
commit 4807e292b4
9 changed files with 107 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Directory.Build.props
View file

@ -14,7 +14,7 @@
<Version>1.0.0</Version> <Version>1.0.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion> <AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion> <FileVersion>1.0.0</FileVersion>
<AssemblySearchPaths Condition="'$(TargetFramework)' == 'net471'">{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName};</AssemblySearchPaths> <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net471'">{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName};{GAC};</AssemblySearchPaths>
</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'))">

4
src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
</Weavers>

11
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
View file

@ -5,6 +5,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' "> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
<FrameworkReference Include="Microsoft.DesktopUI" /> <FrameworkReference Include="Microsoft.DesktopUI" />
</ItemGroup> </ItemGroup>
@ -47,6 +53,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.17.0" />
<PackageReference Include="CommonServiceLocator"> <PackageReference Include="CommonServiceLocator">
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
@ -65,5 +72,9 @@
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.19</Version> <Version>0.7.19</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Fody" Version="3.2.13">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Greenshot.Addons/FodyWeavers.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
</Weavers>

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

@ -33,6 +33,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.17.0" />
<PackageReference Include="CommonServiceLocator"> <PackageReference Include="CommonServiceLocator">
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
@ -60,8 +61,12 @@
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.19</Version> <Version>0.7.19</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Fody" Version="3.2.13">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks"> <PackageReference Include="MahApps.Metro.IconPacks">
<Version>3.0.0-alpha0082</Version> <Version>3.0.0-alpha0086</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Svg"> <PackageReference Include="Svg">
<Version>2.3.0</Version> <Version>2.3.0</Version>

2
src/Greenshot/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Weavers> <Weavers>
<!--<Costura />--> <AutoProperties />
</Weavers> </Weavers>

39
src/Greenshot/Forms/MainForm.cs
View file

@ -923,6 +923,7 @@ namespace Greenshot.Forms
contextmenu_quicksettings.DropDownItems.Add(selectList); contextmenu_quicksettings.DropDownItems.Add(selectList);
} }
var languageKeys = _greenshotLanguage.Keys().ToList();
if (!_coreConfiguration.IsWriteProtected("WindowCaptureMode")) if (!_coreConfiguration.IsWriteProtected("WindowCaptureMode"))
{ {
// Capture Modes // Capture Modes
@ -933,7 +934,15 @@ namespace Greenshot.Forms
var enumTypeName = typeof(WindowCaptureModes).Name; var enumTypeName = typeof(WindowCaptureModes).Name;
foreach (WindowCaptureModes captureMode in Enum.GetValues(typeof(WindowCaptureModes))) foreach (WindowCaptureModes captureMode in Enum.GetValues(typeof(WindowCaptureModes)))
{ {
selectList.AddItem(_greenshotLanguage[enumTypeName + "." + captureMode], captureMode, _coreConfiguration.WindowCaptureMode == captureMode); var key = enumTypeName + "." + captureMode;
if (languageKeys.Contains(key))
{
selectList.AddItem(_greenshotLanguage[key], captureMode, _coreConfiguration.WindowCaptureMode == captureMode);
}
else
{
Log.Warn().WriteLine("Missing translation for {0}", key);
}
} }
selectList.CheckedChanged += QuickSettingCaptureModeChanged; selectList.CheckedChanged += QuickSettingCaptureModeChanged;
contextmenu_quicksettings.DropDownItems.Add(selectList); contextmenu_quicksettings.DropDownItems.Add(selectList);
@ -947,7 +956,15 @@ namespace Greenshot.Forms
foreach (var outputPrintIniValue in _coreConfiguration.GetIniValues().Values.Where(value => value.PropertyName.StartsWith("OutputPrint") && value.ValueType == typeof(bool) && !_coreConfiguration.IsWriteProtected(value.PropertyName))) foreach (var outputPrintIniValue in _coreConfiguration.GetIniValues().Values.Where(value => value.PropertyName.StartsWith("OutputPrint") && value.ValueType == typeof(bool) && !_coreConfiguration.IsWriteProtected(value.PropertyName)))
{ {
selectList.AddItem(_greenshotLanguage[outputPrintIniValue.PropertyName], outputPrintIniValue, (bool) outputPrintIniValue.Value); var key = outputPrintIniValue.PropertyName;
if (languageKeys.Contains(key))
{
selectList.AddItem(_greenshotLanguage[key], outputPrintIniValue, (bool)outputPrintIniValue.Value);
}
else
{
Log.Warn().WriteLine("Missing translation for {0}", key);
}
} }
if (selectList.DropDownItems.Count > 0) if (selectList.DropDownItems.Count > 0)
{ {
@ -970,13 +987,27 @@ namespace Greenshot.Forms
if (!_coreConfiguration.IsWriteProtected(iniValue.PropertyName)) if (!_coreConfiguration.IsWriteProtected(iniValue.PropertyName))
{ {
selectList.AddItem(_greenshotLanguage[languageKey], iniValue, (bool) iniValue.Value); if (languageKeys.Contains(languageKey))
{
selectList.AddItem(_greenshotLanguage[languageKey], iniValue, (bool)iniValue.Value);
}
else
{
Log.Warn().WriteLine("Missing translation for {0}", languageKey);
}
} }
iniValue = _coreConfiguration.GetIniValue("ShowTrayNotification"); iniValue = _coreConfiguration.GetIniValue("ShowTrayNotification");
languageKey = _coreConfiguration.GetTagValue(iniValue.PropertyName, ConfigTags.LanguageKey) as string; languageKey = _coreConfiguration.GetTagValue(iniValue.PropertyName, ConfigTags.LanguageKey) as string;
if (!_coreConfiguration.IsWriteProtected(iniValue.PropertyName)) if (!_coreConfiguration.IsWriteProtected(iniValue.PropertyName))
{ {
selectList.AddItem(_greenshotLanguage[languageKey], iniValue, (bool) iniValue.Value); if (languageKeys.Contains(languageKey))
{
selectList.AddItem(_greenshotLanguage[languageKey], iniValue, (bool)iniValue.Value);
}
else
{
Log.Warn().WriteLine("Missing translation for {0}", languageKey);
}
} }
if (selectList.DropDownItems.Count > 0) if (selectList.DropDownItems.Count > 0)
{ {

133
src/Greenshot/Greenshot.csproj
View file

@ -9,47 +9,27 @@
<ApplicationManifest>greenshot.manifest</ApplicationManifest> <ApplicationManifest>greenshot.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<None Include="Languages\language*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' "> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
<FrameworkReference Include="Microsoft.DesktopUI" /> <FrameworkReference Include="Microsoft.DesktopUI" />
<PackageReference Include="System.Collections"> <PackageReference Include="System.Collections" Version="4.3.0" />
<Version>4.3.0</Version> <PackageReference Include="System.Console" Version="4.3.1" />
</PackageReference> <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.Console"> <PackageReference Include="System.Globalization" Version="4.3.0" />
<Version>4.3.1</Version> <PackageReference Include="System.IO" Version="4.3.0" />
</PackageReference> <PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Debug"> <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
<Version>4.3.0</Version> <PackageReference Include="System.Reflection" Version="4.3.0" />
</PackageReference> <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Globalization"> <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<Version>4.3.0</Version> <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
</PackageReference> <PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.IO"> <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Linq">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Linq.Expressions">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Extensions">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions">
<Version>4.5.1</Version>
</PackageReference>
<PackageReference Include="System.Resources.ResourceManager">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.Extensions">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net471' "> <ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
@ -76,60 +56,29 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac.Extras.CommonServiceLocator"> <PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="5.0.0" />
<Version>5.0.0</Version> <PackageReference Include="AutoProperties.Fody" Version="1.17.0" />
</PackageReference> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="CommandLineParser"> <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<Version>2.3.0</Version> <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.10-ge2d1078449" />
</PackageReference> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.10-ge2d1078449" />
<PackageReference Include="CommonServiceLocator"> <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.10-ge2d1078449" />
<Version>2.0.4</Version> <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.10-ge2d1078449" />
</PackageReference> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.10-ge2d1078449" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp"> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.6" />
<Version>1.1.10-ge2d1078449</Version> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.6" />
</PackageReference> <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
<Version>1.1.10-ge2d1078449</Version> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
</PackageReference> <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.19" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro"> <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.19" />
<Version>1.1.10-ge2d1078449</Version> <PackageReference Include="Fody" Version="3.2.13">
</PackageReference> <PrivateAssets>all</PrivateAssets>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts"> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<Version>1.1.10-ge2d1078449</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.10-ge2d1078449</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.9.6</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.6</Version>
</PackageReference>
<PackageReference Include="Dapplo.Log.LogFile">
<Version>1.3.11</Version>
</PackageReference>
<PackageReference Include="Dapplo.Log.Loggers">
<Version>1.3.11</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.7.19</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.19</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Multimedia">
<Version>0.7.19</Version>
</PackageReference>
<PackageReference Include="gong-wpf-dragdrop">
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks">
<Version>3.0.0-alpha0082</Version>
</PackageReference>
<PackageReference Include="Svg">
<Version>2.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0098" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0086" />
<PackageReference Include="Svg" Version="2.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
src/Greenshot/Startup.cs
View file

@ -65,7 +65,7 @@ namespace Greenshot
//LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified();
#if DEBUG #if DEBUG
// Initialize a debug logger for Dapplo packages // Initialize a debug logger for Dapplo packages
LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Debug); LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Verbose);
#endif #endif
var applicationConfig = ApplicationConfigBuilder var applicationConfig = ApplicationConfigBuilder
.Create() .Create()
@ -73,6 +73,9 @@ namespace Greenshot
.WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08") .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08")
.WithCaliburnMicro() .WithCaliburnMicro()
.WithoutCopyOfEmbeddedAssemblies() .WithoutCopyOfEmbeddedAssemblies()
#if !NETCOREAPP3_0
.WithoutCopyOfAssembliesToProbingPath()
#endif
.WithAssemblyPatterns("Greenshot.Addon*") .WithAssemblyPatterns("Greenshot.Addon*")
.BuildApplicationConfig(); .BuildApplicationConfig();