Updated MahApps.Metro and other dependencies, added an initial azure-pipelines.yml and removed unneeded building of .nupkg on every build. Also removed all the project references of all projects which are not directly needed (Greenshot.Addon.InternetExplorer is still needed), and when these are build the output is xcopied to the Greenshot solution bin directories so they can be picked up.

NuGet.Config

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <add key="nugetv3" value="https://api.nuget.org/v3/index.json" />
     <add key="Dapplo.Addons" value="https://ci.appveyor.com/nuget/dapplo-addons-8psw2ibvh832" />
     <add key="Dapplo.Config" value="https://ci.appveyor.com/nuget/dapplo-config-85fagsv5oequ" />
     <add key="Dapplo.CaliburnMicro" value="https://ci.appveyor.com/nuget/dapplo-caliburnmicro-46kaa8k8ft4i" />
     <add key="Dapplo.HttpExtensions" value="https://ci.appveyor.com/nuget/dapplo-httpextensions-6qa60p3t5ixy" />
     <add key="Dapplo.Windows" value="https://ci.appveyor.com/nuget/dapplo-windows-pjnkjqjp7t6a" />
+	<add key="myget.dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="dotnet-core-latest" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
 </configuration>

azure-pipelines.yml

@@ -0,0 +1,54 @@
+# .NET Desktop
+# Build and run tests for .NET Desktop or Windows classic desktop solutions.
+# Add steps that publish symbols, save build artifacts, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
+
+pool:
+  vmImage: 'VS2017-Win2016'
+
+variables:
+  solution: '**/*.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: DotNetCoreInstaller@0
+  displayName: 'Use .NET Core sdk 3.0'
+  inputs:
+    version: '3.0.100-preview-009825'
+
+- task: NuGetToolInstaller@0
+  displayName: 'Use NuGet 4.9.2'
+  inputs:
+    versionSpec: 4.9.2
+    checkLatest: true
+
+- task: NuGetCommand@2
+  displayName: NuGet restore
+  inputs:
+    restoreSolution: '$(solution)'
+    feedsToUse: config
+
+- task: VSBuild@1
+  displayName: 'Build solution **\*.sln'
+  inputs:
+    vsVersion: 'latest'
+    solution: '$(solution)'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- task: CopyFiles@2
+  displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
+  inputs:
+    SourceFolder: '$(system.defaultworkingdirectory)'
+    Contents: |
+     **\bin\$(BuildConfiguration)\*.nupkg
+     **\TestResults\**\*.coverage
+    TargetFolder: '$(build.artifactstagingdirectory)'
+    flattenFolders: true
+
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Artifact: drop'
+  inputs:
+    PathtoPublish: '$(build.artifactstagingdirectory)'

src/Directory.Build.props

@@ -23,7 +23,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(MSBuildProjectName.Contains('Tests')) Or $(MSBuildProjectName.Contains('Demo'))">
@@ -55,4 +55,18 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+
+  <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.Contains('Addon.')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
+    <Exec Command="
+    xcopy /q /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
+    xcopy /q /y /d &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
+    xcopy /q /y /d &quot;$(TargetDir)*.pdb&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
+    xcopy /q /y /d &quot;$(TargetDir)*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;&#xD;&#xA;
+    IF EXIST &quot;$(TargetDir)Languages&quot; (&#xD;&#xA;
+        IF NOT EXIST &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot; (&#xD;&#xA;
+            mkdir &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA;
+        )&#xD;&#xA;
+        xcopy /q /y /d &quot;$(TargetDir)Languages\*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA;
+	)" />
+  </Target>
 </Project>

src/Greenshot.Addon.Box/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj

@@ -44,13 +44,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Confluence/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj

@@ -51,13 +51,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
     <PackageReference Include="Dapplo.Confluence" Version="0.8.16" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Dropbox/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj

@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.ExternalCommand/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj

@@ -38,11 +38,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
 	<PackageReference Include="CliWrap" Version="2.1.0" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Flickr/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj

@@ -46,11 +46,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.GooglePhotos/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj

@@ -46,11 +46,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Imgur/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj

@@ -46,15 +46,15 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0170" />
   </ItemGroup>
 </Project>

src/Greenshot.Addon.Jira/FodyWeavers.xsd

@@ -1,19 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
+        <xs:element name="Costura" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:all>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:all>
+            <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableCompression" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisableCleanup" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="PreloadOrder" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj

@@ -48,14 +48,14 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
 	<PackageReference Include="Dapplo.Jira" Version="0.8.9" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.LegacyEditor/Drawing/TextContainer.cs

@@ -31,6 +31,9 @@ using Dapplo.Windows.Common.Structs;
 using Greenshot.Addon.LegacyEditor.Drawing.Fields;
 using Greenshot.Addon.LegacyEditor.Memento;
 using Greenshot.Addons.Interfaces.Drawing;
+#if DEBUG
+using System.Diagnostics;
+#endif
 
 namespace Greenshot.Addon.LegacyEditor.Drawing
 {

src/Greenshot.Addon.LegacyEditor/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj

@@ -133,12 +133,12 @@
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
     <PackageReference Include="Dapplo.Windows.Icons" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Lutim/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj

@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0170" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.OCR/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj

@@ -38,10 +38,10 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>WinExe</OutputType>
     <TargetFrameworks>net471</TargetFrameworks>
     <RootNamespace>Greenshot.Addon.OcrCommand</RootNamespace>
     <AssemblyName>GreenshotOCRCommand</AssemblyName>

src/Greenshot.Addon.OcrCommand/Program.cs

@@ -27,7 +27,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Greenshot.Addon.OcrCommand.Modi;
-
+#if DEBUG
+using System.Diagnostics;
+#endif
 #endregion
 
 namespace Greenshot.Addon.OcrCommand

src/Greenshot.Addon.Office/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj

@@ -45,8 +45,8 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
     <PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
     <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
@@ -54,7 +54,7 @@
     <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1017" />
     <PackageReference Include="Microsoft.Office.Interop.Word" Version="15.0.4797.1003" />
     <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.OneDrive/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj

@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0170" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Photobucket/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj

@@ -46,11 +46,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Tfs/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj

@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
-	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0170" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Greenshot.Addon.Tfs/TfsClient.cs

@@ -28,6 +28,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Dapplo.HttpExtensions;
+using Dapplo.HttpExtensions.ContentConverter;
 using Dapplo.HttpExtensions.Factory;
 using Dapplo.HttpExtensions.JsonNet;
 using Greenshot.Addon.Tfs.Entities;

src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj

@@ -57,8 +57,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
   </ItemGroup>
 </Project>

src/Greenshot.Addons/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot.Addons/Greenshot.Addons.csproj

@@ -44,13 +44,13 @@
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
-      <Version>1.2.10</Version>
+      <Version>1.2.14</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
-      <Version>1.2.10</Version>
+      <Version>1.2.14</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.2.10</Version>
+      <Version>1.2.14</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.HttpExtensions">
       <Version>0.9.18</Version>
@@ -67,12 +67,12 @@
     <PackageReference Include="Dapplo.Windows.Icons">
       <Version>0.8.3</Version>
     </PackageReference>
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>3.0.0-alpha0089</Version>
+      <Version>3.0.0-alpha0096</Version>
     </PackageReference>
     <PackageReference Include="Svg">
       <Version>2.3.0</Version>

src/Greenshot.Gfx/Greenshot.Gfx.csproj

@@ -29,7 +29,7 @@
   
   <ItemGroup>
     <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.2.10</Version>
+      <Version>1.2.14</Version>
     </PackageReference>
     <PackageReference Include="Svg">
       <Version>2.3.0</Version>

src/Greenshot.Tests/Greenshot.Tests.csproj

@@ -69,7 +69,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">

src/Greenshot/Configuration/IMetroConfiguration.cs

@@ -30,10 +30,10 @@ namespace Greenshot.Configuration
     [IniSection("Metro")]
     public interface IMetroConfiguration : IIniSection, IMetroUiConfiguration
     {
-        [DefaultValue(Themes.Light)]
+        [DefaultValue("Light")]
-        new Themes Theme { get; set; }
+        new string Theme { get; set; }
 
-        [DefaultValue(ThemeAccents.Olive)]
+        [DefaultValue("Olive")]
-        new ThemeAccents ThemeAccent { get; set; }
+        new string ThemeColor{ get; set; }
     }
 }

src/Greenshot/Configuration/Impl/MetroConfigurationImpl.cs

@@ -21,14 +21,38 @@
 
 #endregion
 
-using Dapplo.CaliburnMicro.Metro.Configuration;
+using Dapplo.CaliburnMicro.Metro;
 using Dapplo.Config.Ini;
 
 namespace Greenshot.Configuration.Impl
 {
     internal class MetroConfigurationImpl : IniSectionBase<IMetroConfiguration>, IMetroConfiguration
     {
-        public Themes Theme { get; set; }
+        private readonly MetroThemeManager _metroThemeManager;
-        public ThemeAccents ThemeAccent { get; set; }
+        public MetroConfigurationImpl(MetroThemeManager metroThemeManager)
+        {
+            _metroThemeManager = metroThemeManager;
+        }
+        public string Theme { get; set; }
+        public string ThemeColor { get; set; }
+
+        #region Overrides of IniSectionBase<IMetroConfiguration>
+
+        public override void AfterLoad()
+        {
+            if (string.IsNullOrEmpty(Theme))
+            {
+                Theme = null;
+            }
+            if (string.IsNullOrEmpty(ThemeColor))
+            {
+                ThemeColor = null;
+            }
+            _metroThemeManager.ChangeTheme(Theme, ThemeColor);
+
+            base.AfterLoad();
+        }
+
+        #endregion
     }
 }

src/Greenshot/FodyWeavers.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
@@ -8,12 +8,17 @@
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
     </xs:complexType>

src/Greenshot/Greenshot.csproj

@@ -79,11 +79,11 @@
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.14" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.10" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.14" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
     <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
@@ -91,37 +91,20 @@
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.3" />
     <PackageReference Include="Dapplo.Windows.Icons" Version="0.8.3" />
     <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.3" />
-    <PackageReference Include="Fody" Version="3.3.2">
+    <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0106" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0089" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0096" />
     <PackageReference Include="Svg" Version="2.3.0" />
   </ItemGroup>
   
   <ItemGroup>
+    <ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
     <ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
     <ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
     <ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Box\Greenshot.Addon.Box.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Confluence\Greenshot.Addon.Confluence.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Flickr\Greenshot.Addon.Flickr.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.GooglePhotos\Greenshot.Addon.GooglePhotos.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Imgur\Greenshot.Addon.Imgur.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.OCR\Greenshot.Addon.OCR.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Office\Greenshot.Addon.Office.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.OneDrive\Greenshot.Addon.OneDrive.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj" />
-    <ProjectReference Include="..\Greenshot.Addon.Tfs\Greenshot.Addon.Tfs.csproj" />
     <ProjectReference Condition="$(OsProductName.Contains('Windows 10'))" Include="..\Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
-    <ProjectReference Include="..\Greenshot.Addon.Jira\Greenshot.Addon.Jira.csproj" />
-  </ItemGroup>
 </Project>

src/Greenshot/Languages/language-de-DE.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <language description="Deutsch" ietf="de-DE" version="1.1.1.2550" languagegroup="1">
-	<resources>
-
-<language>
 	<resources prefix="Core">
 		<resource name="about_bugs">Bitte melden Sie Fehler unter</resource>
 		<resource name="about_donations">Wenn Sie Greenshot mögen, können Sie uns gerne unterstützen:</resource>

src/Greenshot/Startup.cs

@@ -34,6 +34,10 @@ using Dapplo.Addons.Bootstrapper;
 using Dapplo.CaliburnMicro.Dapp;
 using Dapplo.Config.Ini.Converters;
 using Dapplo.Config.Language;
+using Dapplo.Log;
+#if DEBUG
+using Dapplo.Log.Loggers;
+#endif
 using Dapplo.Utils;
 using Dapplo.Windows.Common.Structs;
 using Dapplo.Windows.Dpi.Forms;

src/Greenshot/Ui/Configuration/ViewModels/UiConfigViewModel.cs

@@ -24,12 +24,11 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Reactive.Disposables;
 using Dapplo.CaliburnMicro.Configuration;
 using Dapplo.CaliburnMicro.Extensions;
 using Dapplo.CaliburnMicro.Metro;
-using Dapplo.CaliburnMicro.Metro.Configuration;
+using Dapplo.Config.Intercepting;
 using Dapplo.Utils.Extensions;
 using Greenshot.Addons;
 using Greenshot.Addons.Core;
@@ -40,20 +39,22 @@ namespace Greenshot.Ui.Configuration.ViewModels
 {
     public sealed class UiConfigViewModel : SimpleConfigScreen
     {
+        private readonly MetroThemeManager _metroThemeManager;
+
         /// <summary>
         ///     Here all disposables are registered, so we can clean the up
         /// </summary>
         private CompositeDisposable _disposables;
 
         /// <summary>
-        ///     The avaible theme accents
+        ///     The available themes
         /// </summary>
-        public ObservableCollection<Tuple<ThemeAccents, string>> AvailableThemeAccents { get; set; } = new ObservableCollection<Tuple<ThemeAccents, string>>();
+        public ObservableCollection<string> AvailableThemes { get; set; } = new ObservableCollection<string>();
 
         /// <summary>
-        ///     The avaible themes
+        ///     The available theme colors
         /// </summary>
-        public ObservableCollection<Tuple<Themes, string>> AvailableThemes { get; set; } = new ObservableCollection<Tuple<Themes, string>>();
+        public ObservableCollection<string> AvailableThemeColors { get; set; } = new ObservableCollection<string>();
 
         /// <summary>
         /// Used from the View
@@ -77,29 +78,35 @@ namespace Greenshot.Ui.Configuration.ViewModels
 
         public IGreenshotLanguage GreenshotLanguage { get; }
 
-        private MetroWindowManager MetroWindowManager { get; }
+        /// <summary>
-
+        /// Default constructor for DI usage
+        /// </summary>
+        /// <param name="coreConfiguration">ICoreConfiguration</param>
+        /// <param name="greenshotLanguage">IGreenshotLanguage</param>
+        /// <param name="configTranslations">IConfigTranslations</param>
+        /// <param name="metroConfiguration">IMetroConfiguration</param>
+        /// <param name="metroThemeManager">MetroThemeManager</param>
         public UiConfigViewModel(
             ICoreConfiguration coreConfiguration,
             IGreenshotLanguage greenshotLanguage,
             IConfigTranslations configTranslations,
             IMetroConfiguration metroConfiguration,
-            MetroWindowManager metroWindowManager
+            MetroThemeManager metroThemeManager
-
             )
         {
+            _metroThemeManager = metroThemeManager;
             CoreConfiguration = coreConfiguration;
             GreenshotLanguage = greenshotLanguage;
             ConfigTranslations = configTranslations;
             MetroConfiguration = metroConfiguration;
-            MetroWindowManager = metroWindowManager;
         }
 
         public override void Commit()
         {
+            // Manually commit
+            _metroThemeManager.ChangeTheme(MetroConfiguration.Theme, MetroConfiguration.ThemeColor);
             // Manually commit
             MetroConfiguration.CommitTransaction();
-            MetroWindowManager.ChangeTheme(MetroConfiguration.Theme, MetroConfiguration.ThemeAccent);
 
             CoreConfiguration.CommitTransaction();
             // TODO: Fix
@@ -107,24 +114,28 @@ namespace Greenshot.Ui.Configuration.ViewModels
 
         }
 
+        /// <inheritdoc />
+        public override void Rollback()
+        {
+            MetroConfiguration.RollbackTransaction();
+            _metroThemeManager.ChangeTheme(MetroConfiguration.Theme, MetroConfiguration.ThemeColor);
+        }
+
+        /// <inheritdoc />
+        public override void Terminate()
+        {
+            MetroConfiguration.RollbackTransaction();
+            _metroThemeManager.ChangeTheme(MetroConfiguration.Theme, MetroConfiguration.ThemeColor);
+        }
+
         public override void Initialize(IConfig config)
         {
             // Prepare disposables
             _disposables?.Dispose();
 
-            AvailableThemeAccents.Clear();
-            foreach (var themeAccent in Enum.GetValues(typeof(ThemeAccents)).Cast<ThemeAccents>())
-            {
-                var translation = themeAccent.EnumValueOf();
-                AvailableThemeAccents.Add(new Tuple<ThemeAccents, string>(themeAccent, translation));
-            }
-
             AvailableThemes.Clear();
-            foreach (var theme in Enum.GetValues(typeof(Themes)).Cast<Themes>())
+            MetroThemeManager.AvailableThemes.ForEach(themeBaseColor => AvailableThemes.Add(themeBaseColor));
-            {
+            MetroThemeManager.AvailableThemeColors.ForEach(colorScheme => AvailableThemeColors.Add(colorScheme));
-                var translation = theme.EnumValueOf();
-                AvailableThemes.Add(new Tuple<Themes, string>(theme, translation));
-            }
 
             // Place this under the Ui parent
             ParentId = nameof(ConfigIds.Ui);
@@ -138,6 +149,25 @@ namespace Greenshot.Ui.Configuration.ViewModels
                 GreenshotLanguage.CreateDisplayNameBinding(this, nameof(IGreenshotLanguage.SettingsTitle))
             };
 
+            // Automatically show theme changes
+            _disposables.Add(
+                MetroConfiguration.OnPropertyChanging(nameof(MetroConfiguration.Theme)).Subscribe(args =>
+                {
+                    if (args is PropertyChangingEventArgsEx propertyChangingEventArgsEx)
+                    {
+                        _metroThemeManager.ChangeTheme(propertyChangingEventArgsEx.NewValue as string, null);
+                    }
+                })
+            );
+            _disposables.Add(
+                MetroConfiguration.OnPropertyChanging(nameof(MetroConfiguration.ThemeColor)).Subscribe(args =>
+                {
+                    if (args is PropertyChangingEventArgsEx propertyChangingEventArgsEx)
+                    {
+                        _metroThemeManager.ChangeTheme(null, propertyChangingEventArgsEx.NewValue as string);
+                    }
+                })
+            );
             base.Initialize(config);
         }
 

src/Greenshot/Ui/Configuration/Views/UiConfigView.xaml

@@ -10,8 +10,8 @@
     <StackPanel>
         <DockPanel>
             <Label Content="{Binding ConfigTranslations.Theme}" Width="50" />
-            <ComboBox ItemsSource="{Binding AvailableThemes}" SelectedValuePath="Item1" DisplayMemberPath="Item2" SelectedValue="{Binding MetroConfiguration.Theme}"/>
+            <ComboBox ItemsSource="{Binding AvailableThemes}" SelectedValuePath="." DisplayMemberPath="." SelectedValue="{Binding MetroConfiguration.Theme}" />
-            <ComboBox ItemsSource="{Binding AvailableThemeAccents}" SelectedValuePath="Item1" DisplayMemberPath="Item2" SelectedValue="{Binding MetroConfiguration.ThemeAccent}"/>
+            <ComboBox ItemsSource="{Binding AvailableThemeColors}" SelectedValuePath="." DisplayMemberPath="." SelectedValue="{Binding MetroConfiguration.ThemeColor}" />
         </DockPanel>
         <DockPanel LastChildFill="True">
             <Label Content="{Binding GreenshotLanguage.SettingsLanguage}" Width="100" />

src/global.json

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