Skip to content

Commit d05ce40

Browse files
Goz3rrGoz3rr
committed
Update to .NET 4.7.2
1 parent 4dccc5e commit d05ce40

File tree

11 files changed

+303
-701
lines changed

11 files changed

+303
-701
lines changed

‎SatisfactorySaveEditor/App.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
1010
</startup>
1111
<userSettings>
1212
<SatisfactorySaveEditor.Properties.Settings>
@@ -34,7 +34,11 @@
3434
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3535
<dependentAssembly>
3636
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
37-
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
37+
<bindingRedirect oldVersion="0.0.0.0-2.0.5.0" newVersion="2.0.5.0" />
38+
</dependentAssembly>
39+
<dependentAssembly>
40+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
41+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
3842
</dependentAssembly>
3943
</assemblyBinding>
4044
</runtime>

‎SatisfactorySaveEditor/NLog.xsd

Lines changed: 267 additions & 140 deletions
Large diffs are not rendered by default.

‎SatisfactorySaveEditor/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SatisfactorySaveEditor/Rendering/Sample2DRenderer.cs

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎SatisfactorySaveEditor/SatisfactorySaveEditor.csproj

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>SatisfactorySaveEditor</RootNamespace>
1010
<AssemblyName>SatisfactorySaveEditor</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
@@ -41,14 +41,14 @@
4141
<ApplicationIcon>satisfactorysaveeditorlogo_powershard.ico</ApplicationIcon>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="AsyncAwaitBestPractices, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\AsyncAwaitBestPractices.3.0.0\lib\netstandard1.0\AsyncAwaitBestPractices.dll</HintPath>
44+
<Reference Include="AsyncAwaitBestPractices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=532360cfd341384d, processorArchitecture=MSIL">
45+
<HintPath>..\packages\AsyncAwaitBestPractices.4.2.0\lib\netstandard1.0\AsyncAwaitBestPractices.dll</HintPath>
4646
</Reference>
47-
<Reference Include="AsyncAwaitBestPractices.MVVM, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\AsyncAwaitBestPractices.MVVM.3.0.0\lib\netstandard2.0\AsyncAwaitBestPractices.MVVM.dll</HintPath>
47+
<Reference Include="AsyncAwaitBestPractices.MVVM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=fd3d463fd20deb6c, processorArchitecture=MSIL">
48+
<HintPath>..\packages\AsyncAwaitBestPractices.MVVM.4.2.0\lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.dll</HintPath>
4949
</Reference>
50-
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
51-
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
50+
<Reference Include="CommonServiceLocator, Version=2.0.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
51+
<HintPath>..\packages\CommonServiceLocator.2.0.5\lib\net47\CommonServiceLocator.dll</HintPath>
5252
</Reference>
5353
<Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
5454
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
@@ -60,37 +60,28 @@
6060
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
6161
</Reference>
6262
<Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL">
63-
<HintPath>..\packages\gong-wpf-dragdrop.2.0.1\lib\net46\GongSolutions.WPF.DragDrop.dll</HintPath>
63+
<HintPath>..\packages\gong-wpf-dragdrop.2.2.0\lib\net47\GongSolutions.WPF.DragDrop.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
66+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6767
</Reference>
6868
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
69-
<HintPath>..\packages\NLog.4.6.4\lib\net45\NLog.dll</HintPath>
70-
</Reference>
71-
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
72-
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
73-
</Reference>
74-
<Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
75-
<HintPath>..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
76-
</Reference>
77-
<Reference Include="SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
78-
<HintPath>..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
79-
</Reference>
80-
<Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
81-
<HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
82-
</Reference>
83-
<Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
84-
<HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
69+
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
8570
</Reference>
8671
<Reference Include="System" />
8772
<Reference Include="System.Configuration" />
8873
<Reference Include="System.Data" />
8974
<Reference Include="System.Drawing" />
9075
<Reference Include="System.IO.Compression" />
9176
<Reference Include="System.IO.Compression.FileSystem" />
77+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
79+
</Reference>
9280
<Reference Include="System.Runtime.Serialization" />
9381
<Reference Include="System.ServiceModel" />
82+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
83+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
84+
</Reference>
9485
<Reference Include="System.Transactions" />
9586
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9687
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
@@ -148,7 +139,6 @@
148139
<Compile Include="Model\SaveObjectModel.cs" />
149140
<Compile Include="Model\SaveRootModel.cs" />
150141
<Compile Include="Model\TypeTooltip.cs" />
151-
<Compile Include="Rendering\Sample2DRenderer.cs" />
152142
<Compile Include="Util\EditorTreeNode.cs" />
153143
<Compile Include="Util\BindingProxy.cs" />
154144
<Compile Include="Util\FloatRangeRule.cs" />
@@ -200,9 +190,6 @@
200190
<Compile Include="View\Control\PropertiesControl.xaml.cs">
201191
<DependentUpon>PropertiesControl.xaml</DependentUpon>
202192
</Compile>
203-
<Compile Include="View\Control\SharpDx\Direct2DComponent.cs" />
204-
<Compile Include="View\Control\SharpDx\DirectXComponent.cs" />
205-
<Compile Include="View\Control\SharpDx\Win32HwndControl.cs" />
206193
<Compile Include="View\PreferencesWindow.xaml.cs">
207194
<DependentUpon>PreferencesWindow.xaml</DependentUpon>
208195
</Compile>
@@ -426,4 +413,4 @@
426413
del "$(TargetDir)SatisfactorySave*.xml", "$(TargetDir)SatisfactorySave*.pdb"
427414
)</PostBuildEvent>
428415
</PropertyGroup>
429-
</Project>
416+
</Project>

‎SatisfactorySaveEditor/View/Control/SharpDx/Direct2DComponent.cs

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)