-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #139 from nooperation/develop
Dev to master (.net 4.7.2)
- Loading branch information
Showing
12 changed files
with
79 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,8 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="LibSanBag" version="1.6.8" targetFramework="net46" /> | ||
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" /> | ||
<package id="SanTools.LibCRN" version="1.0.8" targetFramework="net46" /> | ||
<package id="SanTools.LibFSB" version="1.0.0" targetFramework="net46" /> | ||
<package id="SanTools.LibKraken" version="1.0.0" targetFramework="net46" /> | ||
<package id="SanTools.LibUserPreferences" version="1.0.6" targetFramework="net46" /> | ||
<package id="LibSanBag" version="1.7.1" targetFramework="net472" /> | ||
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" /> | ||
<package id="SanTools.LibCRN" version="1.0.8" targetFramework="net472" /> | ||
<package id="SanTools.LibFSB" version="1.0.2" targetFramework="net472" /> | ||
<package id="SanTools.LibUserPreferences" version="1.0.6" targetFramework="net472" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<dependentAssembly> | ||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> | ||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/> | ||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
</configuration> | ||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,16 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="HelixToolkit" version="1.0.0" targetFramework="net46" /> | ||
<package id="HelixToolkit.Wpf" version="1.0.0" targetFramework="net46" /> | ||
<package id="Humanizer.Core" version="2.2.0" targetFramework="net46" /> | ||
<package id="ICSharpCode.Decompiler" version="4.0.0.4509-rc1" targetFramework="net46" /> | ||
<package id="LibSanBag" version="1.6.8" targetFramework="net46" /> | ||
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> | ||
<package id="SanTools.LibCRN" version="1.0.8" targetFramework="net46" /> | ||
<package id="SanTools.LibFSB" version="1.0.0" targetFramework="net46" /> | ||
<package id="SanTools.LibKraken" version="1.0.0" targetFramework="net46" /> | ||
<package id="SanTools.LibUserPreferences" version="1.0.6" targetFramework="net46" /> | ||
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net46" /> | ||
<package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net46" /> | ||
<package id="System.ValueTuple" version="4.3.0" targetFramework="net46" /> | ||
<package id="WPFHexaEditor" version="1.2.1" targetFramework="net46" /> | ||
<package id="HelixToolkit" version="2.6.0" targetFramework="net472" /> | ||
<package id="HelixToolkit.Wpf" version="2.6.0" targetFramework="net472" /> | ||
<package id="Humanizer.Core" version="2.2.0" targetFramework="net472" /> | ||
<package id="ICSharpCode.Decompiler" version="4.0.0.4521" targetFramework="net472" /> | ||
<package id="LibSanBag" version="1.7.1" targetFramework="net472" /> | ||
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" /> | ||
<package id="SanTools.LibCRN" version="1.0.8" targetFramework="net472" /> | ||
<package id="SanTools.LibFSB" version="1.0.2" targetFramework="net472" /> | ||
<package id="SanTools.LibUserPreferences" version="1.0.6" targetFramework="net472" /> | ||
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" /> | ||
<package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" /> | ||
<package id="System.ValueTuple" version="4.3.0" targetFramework="net472" /> | ||
<package id="WPFHexaEditor" version="1.4.0" targetFramework="net472" /> | ||
</packages> |
Oops, something went wrong.