diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f3d37ee11..e51fb46d1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -14,7 +14,7 @@
1.0.0
1.0.0
1.0.0
- {HintPathFromItem};{TargetFrameworkDirectory};{RawFileName};
+ {HintPathFromItem};{TargetFrameworkDirectory};{RawFileName};{GAC};
diff --git a/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml b/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml
new file mode 100644
index 000000000..c7704e778
--- /dev/null
+++ b/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
index 9a3a631c9..bfc4b3527 100644
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@@ -5,6 +5,12 @@
true
+
+
+ PreserveNewest
+
+
+
@@ -47,6 +53,7 @@
+
2.0.4
@@ -65,5 +72,9 @@
0.7.19
+
+ all
+ runtime; build; native; contentfiles; analyzers
+
\ No newline at end of file
diff --git a/src/Greenshot.Addons/FodyWeavers.xml b/src/Greenshot.Addons/FodyWeavers.xml
new file mode 100644
index 000000000..1d219da8e
--- /dev/null
+++ b/src/Greenshot.Addons/FodyWeavers.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 9ef96c867..124c4683c 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -33,6 +33,7 @@
+
2.0.4
@@ -60,8 +61,12 @@
0.7.19
+
+ all
+ runtime; build; native; contentfiles; analyzers
+
- 3.0.0-alpha0082
+ 3.0.0-alpha0086
2.3.0
diff --git a/src/Greenshot/FodyWeavers.xml b/src/Greenshot/FodyWeavers.xml
index d099b051c..c7704e778 100644
--- a/src/Greenshot/FodyWeavers.xml
+++ b/src/Greenshot/FodyWeavers.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs
index cef520aaa..bd5ab013f 100644
--- a/src/Greenshot/Forms/MainForm.cs
+++ b/src/Greenshot/Forms/MainForm.cs
@@ -923,6 +923,7 @@ namespace Greenshot.Forms
contextmenu_quicksettings.DropDownItems.Add(selectList);
}
+ var languageKeys = _greenshotLanguage.Keys().ToList();
if (!_coreConfiguration.IsWriteProtected("WindowCaptureMode"))
{
// Capture Modes
@@ -933,7 +934,15 @@ namespace Greenshot.Forms
var enumTypeName = typeof(WindowCaptureModes).Name;
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;
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)))
{
- 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)
{
@@ -970,13 +987,27 @@ namespace Greenshot.Forms
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");
languageKey = _coreConfiguration.GetTagValue(iniValue.PropertyName, ConfigTags.LanguageKey) as string;
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)
{
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index bce265512..daededc72 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -9,47 +9,27 @@
greenshot.manifest
+
+
+ PreserveNewest
+
+
+
-
- 4.3.0
-
-
- 4.3.1
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.5.1
-
-
- 4.3.0
-
-
- 4.3.0
-
-
- 4.3.0
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,60 +56,29 @@
-
- 5.0.0
-
-
- 2.3.0
-
-
- 2.0.4
-
-
- 1.1.10-ge2d1078449
-
-
- 1.1.10-ge2d1078449
-
-
- 1.1.10-ge2d1078449
-
-
- 1.1.10-ge2d1078449
-
-
- 1.1.10-ge2d1078449
-
-
- 0.9.6
-
-
- 0.9.6
-
-
- 1.3.11
-
-
- 1.3.11
-
-
- 0.7.19
-
-
- 0.7.19
-
-
- 0.7.19
-
-
- 1.1.0
-
-
- 3.0.0-alpha0082
-
-
- 2.3.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers
+
+
+
diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs
index 3d8a5f591..a6b388f77 100644
--- a/src/Greenshot/Startup.cs
+++ b/src/Greenshot/Startup.cs
@@ -65,7 +65,7 @@ namespace Greenshot
//LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified();
#if DEBUG
// Initialize a debug logger for Dapplo packages
- LogSettings.RegisterDefaultLogger(LogLevels.Debug);
+ LogSettings.RegisterDefaultLogger(LogLevels.Verbose);
#endif
var applicationConfig = ApplicationConfigBuilder
.Create()
@@ -73,6 +73,9 @@ namespace Greenshot
.WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08")
.WithCaliburnMicro()
.WithoutCopyOfEmbeddedAssemblies()
+#if !NETCOREAPP3_0
+ .WithoutCopyOfAssembliesToProbingPath()
+#endif
.WithAssemblyPatterns("Greenshot.Addon*")
.BuildApplicationConfig();