Merging master into changes from launcherUI. Wox.Infrastructure assembly info I took the changes from both branches as they will be needed. This currently doesn't build I will make the changes to get it building atomically.

This commit is contained in:
ryanbodrug-microsoft
2020-04-07 14:33:45 -07:00
47 changed files with 177 additions and 1220 deletions

View File

@@ -31,6 +31,16 @@
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SuppressWarnings" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to turn off build warnings from this weaver.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SuppressOnPropertyNameChangedWarning" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to turn off build warnings about mismatched On_PropertyName_Changed methods.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:all>

View File

@@ -1,5 +1,5 @@
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Wox")]
[assembly: InternalsVisibleTo("PowerLauncher")]
[assembly: InternalsVisibleTo("Wox.Core")]
[assembly: InternalsVisibleTo("Wox.Test")]

View File

@@ -59,7 +59,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="PropertyChanged.Fody" Version="3.2.6" />
<PackageReference Include="PropertyChanged.Fody" Version="3.2.7" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
</ItemGroup>