Skip to content

Commit 44921f6

Browse files
Sewer56Sewer56
committed
Remove Redundant & Update Deps. Fix PropertyChanged Dep.
Force copying all deps to output. . . . .
1 parent 8003286 commit 44921f6

File tree

12 files changed

+67
-28
lines changed

12 files changed

+67
-28
lines changed

‎.gitmodules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
url = https://github.com/Sewer56/Rock.Collections.git
77
[submodule "Submodules/DotNetCorePlugins"]
88
path = Submodules/DotNetCorePlugins
9-
url = https://github.com/Sewer56/DotNetCorePlugins.git
10-
[submodule "Submodules/Onova"]
11-
path = Submodules/Onova
12-
url = https://github.com/Sewer56/Onova
9+
url = https://github.com/Sewer56/DotNetCorePlugins.git

‎Source/Reloaded.Mod.Launcher/FodyWeavers.xsd

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,35 @@
44
<xs:element name="Weavers">
55
<xs:complexType>
66
<xs:all>
7-
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1" type="xs:anyType" />
7+
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
10+
<xs:annotation>
11+
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
12+
</xs:annotation>
13+
</xs:attribute>
14+
<xs:attribute name="EventInvokerNames" type="xs:string">
15+
<xs:annotation>
16+
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
17+
</xs:annotation>
18+
</xs:attribute>
19+
<xs:attribute name="CheckForEquality" type="xs:boolean">
20+
<xs:annotation>
21+
<xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
22+
</xs:annotation>
23+
</xs:attribute>
24+
<xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
25+
<xs:annotation>
26+
<xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
27+
</xs:annotation>
28+
</xs:attribute>
29+
<xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
30+
<xs:annotation>
31+
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
32+
</xs:annotation>
33+
</xs:attribute>
34+
</xs:complexType>
35+
</xs:element>
836
</xs:all>
937
<xs:attribute name="VerifyAssembly" type="xs:boolean">
1038
<xs:annotation>

‎Source/Reloaded.Mod.Launcher/Misc/DoNotNotifyAttribute.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
// ReSharper disable once CheckNamespace
6+
namespace PropertyChanged
7+
{
8+
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
9+
public class DoNotNotifyAttribute : Attribute
10+
{
11+
}
12+
}

‎Source/Reloaded.Mod.Launcher/Models/ViewModel/MainPageViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Collections.ObjectModel;
44
using System.Collections.Specialized;
5-
using System.Diagnostics;
65
using System.Drawing;
76
using System.IO;
87
using System.Threading;

‎Source/Reloaded.Mod.Launcher/PropertyChanged.dll

6 KB
Binary file not shown.

‎Source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
<UseWPF>true</UseWPF>
77
<AssemblyName>Reloaded-II</AssemblyName>
88
<RootNamespace>Reloaded.Mod.Launcher</RootNamespace>
9-
<Version>0.9.2</Version>
9+
<Version>0.9.3</Version>
1010
<Copyright>Sewer56 ~ $([System.DateTime]::UtcNow.Year) | $([System.DateTime]::UtcNow.ToString("s"))</Copyright>
1111
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1212
<ApplicationIcon>appicon.ico</ApplicationIcon>
13+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1314
</PropertyGroup>
1415

1516
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -44,6 +45,7 @@
4445
<None Remove="Pages\BaseSubpages\SettingsPage.xaml" />
4546
<None Remove="Pages\Dialogs\FirstLaunch.xaml" />
4647
<None Remove="Pages\Dialogs\MessageBoxOkCancel.xaml" />
48+
<None Remove="PropertyChanged.dll" />
4749
<None Remove="Styles\Settings.xaml" />
4850
<None Remove="Styles\Window_Settings.xaml" />
4951
</ItemGroup>
@@ -100,6 +102,9 @@
100102
<Generator>MSBuild:Compile</Generator>
101103
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
102104
</Content>
105+
<Content Include="PropertyChanged.dll">
106+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
107+
</Content>
103108
<Content Include="Styles\Controls.xaml">
104109
<Generator>MSBuild:Compile</Generator>
105110
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -121,16 +126,17 @@
121126
</ItemGroup>
122127

123128
<ItemGroup>
124-
<PackageReference Include="Fody" Version="4.1.0">
129+
<PackageReference Include="Fody" Version="5.1.1">
125130
<PrivateAssets>all</PrivateAssets>
126131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
127132
</PackageReference>
128-
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.3" />
133+
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.4" />
129134
<PackageReference Include="Ninject" Version="3.3.4" />
130135
<PackageReference Include="Ookii.Dialogs.Wpf" Version="1.1.0" />
131-
<PackageReference Include="PropertyChanged.Fody" Version="2.5.14" />
132-
<PackageReference Include="Reloaded.Assembler" Version="1.0.6" />
133-
<PackageReference Include="Reloaded.Injector" Version="1.2.2" />
136+
<PackageReference Include="PropertyChanged.Fody" Version="3.0.1">
137+
<PrivateAssets>all</PrivateAssets>
138+
</PackageReference>
139+
<PackageReference Include="Reloaded.Memory" Version="1.4.1" />
134140
<PackageReference Include="System.Drawing.Common" Version="4.6.0-preview7.19362.9" />
135141
<PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
136142
</ItemGroup>

‎Source/Reloaded.Mod.Launcher/Utility/ApplicationInstanceTracker.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
43
using System.Diagnostics;
54
using System.IO;
65
using System.Linq;
7-
using System.Runtime.InteropServices;
8-
using System.Text;
96
using System.Threading;
10-
using System.Windows;
11-
using Reloaded.Injector;
12-
using Reloaded.Mod.Launcher.Misc;
137
using Reloaded.Mod.Loader.IO.Config;
148
using Reloaded.Mod.Loader.Server;
159
using Reloaded.Mod.Shared;

‎Source/Reloaded.Mod.Loader.IO/Reloaded.Mod.Loader.IO.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="PropertyChanged.Fody" Version="2.5.14" />
8+
<PackageReference Include="PropertyChanged.Fody" Version="3.0.1">
9+
<PrivateAssets>all</PrivateAssets>
10+
</PackageReference>
911
<PackageReference Include="System.Text.Json" Version="4.6.0-preview7.19362.9" />
1012
</ItemGroup>
1113

‎Source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20181205-02" />
29-
<PackageReference Include="xunit" Version="2.4.0" />
30-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
29+
<PackageReference Include="xunit" Version="2.4.1" />
30+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
31+
<PrivateAssets>all</PrivateAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33+
</PackageReference>
3134
</ItemGroup>
3235

3336
<ItemGroup>

‎Source/Reloaded.Mod.Loader.Update/Reloaded.Mod.Loader.Update.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
6-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
75
</PropertyGroup>
86

97
<ItemGroup>
108
<PackageReference Include="Octokit" Version="0.32.0" />
11-
<PackageReference Include="Onova.rii" Version="2.4.5" />
9+
<PackageReference Include="Onova.rii" Version="2.4.6" />
1210
<PackageReference Include="SharpCompress" Version="0.23.0" />
1311
</ItemGroup>
1412

0 commit comments

Comments
 (0)