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

Updated dependencies, this makes MahApps.Metro in Greenshot work with dotnet core 3.0

Browse source
This commit is contained in:
Robin 2018-11-18 20:20:11 +01:00
commit 5ab1ece38b
56 changed files with 495 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Greenshot.Addon.Box/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Box/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
View file

@ -44,13 +44,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

12
src/Greenshot.Addon.Confluence/FodyWeavers.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura IncludeDebugSymbols='false'>
<IncludeAssemblies>
<?xml version="1.0" encoding="utf-8"?>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura IncludeDebugSymbols="false">
<IncludeAssemblies>
Dapplo.Confluence
Dapplo.HttpExtensions.JsonSimple
</IncludeAssemblies>
</Costura>
<AutoProperties />
</Costura>
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Confluence/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -51,13 +51,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Dropbox/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Dropbox/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
View file

@ -46,13 +46,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.ExternalCommand/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.ExternalCommand/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -38,11 +38,11 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="CliWrap" Version="2.1.0" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Flickr/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Flickr/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
View file

@ -46,11 +46,11 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.GooglePhotos/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.GooglePhotos/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
View file

@ -46,11 +46,11 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Imgur/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Imgur/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -46,15 +46,15 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
</ItemGroup>
</Project>

12
src/Greenshot.Addon.Jira/FodyWeavers.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura IncludeDebugSymbols='false'>
<IncludeAssemblies>
<?xml version="1.0" encoding="utf-8"?>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura IncludeDebugSymbols="false">
<IncludeAssemblies>
Dapplo.Jira
</IncludeAssemblies>
</Costura>
<AutoProperties />
</Costura>
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Jira/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -48,14 +48,14 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Utils" Version="1.1.9" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Jira" Version="0.8.7" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.LegacyEditor/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -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.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Lutim/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Lutim/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -46,13 +46,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.OCR/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.OCR/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
View file

@ -38,10 +38,10 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Office/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Office/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
View file

@ -45,8 +45,8 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<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.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.OneDrive/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.OneDrive/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

8
src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
View file

@ -46,13 +46,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Photobucket/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Photobucket/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

6
src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
View file

@ -46,11 +46,11 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

4
src/Greenshot.Addon.Tfs/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addon.Tfs/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -46,13 +46,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -50,8 +50,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<?xml version="1.0" encoding="utf-8"?>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot.Addons/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

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

@ -43,15 +43,14 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="ControlzEx" Version="3.0.2.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.2.2</Version>
<Version>1.2.5</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.2.2</Version>
<Version>1.2.5</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.2.2</Version>
<Version>1.2.5</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.15</Version>
@ -68,12 +67,12 @@
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.24</Version>
</PackageReference>
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks">
<Version>2.3.0</Version>
<Version>3.0.0-alpha0088</Version>
</PackageReference>
<PackageReference Include="Svg">
<Version>2.3.0</Version>

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

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

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

@ -69,7 +69,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
<PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">

36
src/Greenshot/Configuration/IMetroConfiguration.cs
View file

@ -1,16 +1,40 @@
using System.ComponentModel;
#region Greenshot GNU General Public License
// Greenshot - a free and open source screenshot tool
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
//
// For more information see: http://getgreenshot.org/
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 1 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System.ComponentModel;
using Dapplo.CaliburnMicro.Metro;
using Dapplo.CaliburnMicro.Metro.Configuration;
using Dapplo.Config.Ini;
namespace Greenshot.Configuration
{
[IniSection("Metro")]
public interface IMetroConfiguration : IIniSection
public interface IMetroConfiguration : IIniSection, IMetroUiConfiguration
{
[DefaultValue(Themes.BaseLight)]
Themes Theme { get; set; }
[DefaultValue(Themes.Light)]
new Themes Theme { get; set; }
[DefaultValue(ThemeAccents.Orange)]
ThemeAccents ThemeAccent { get; set; }
[DefaultValue(ThemeAccents.Olive)]
new ThemeAccents ThemeAccent { get; set; }
}
}

4
src/Greenshot/FodyWeavers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<AutoProperties />
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<AutoProperties />
</Weavers>

21
src/Greenshot/FodyWeavers.xsd Normal file
View file

@ -0,0 +1,21 @@
<?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. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<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: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:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

14
src/Greenshot/Greenshot.csproj
View file

@ -80,11 +80,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.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
@ -92,12 +92,12 @@
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0099" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="2.3.0" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0088" />
<PackageReference Include="Svg" Version="2.3.0" />
</ItemGroup>

3
src/Greenshot/Ui/Configuration/ViewModels/UiConfigViewModel.cs
View file

@ -99,8 +99,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
{
// Manually commit
MetroConfiguration.CommitTransaction();
MetroWindowManager.ChangeTheme(MetroConfiguration.Theme);
MetroWindowManager.ChangeThemeAccent(MetroConfiguration.ThemeAccent);
MetroWindowManager.ChangeTheme(MetroConfiguration.Theme, MetroConfiguration.ThemeAccent);
CoreConfiguration.CommitTransaction();
// TODO: Fix