From 095ca0e9282a5d03eb1daa3590d00952b933fe09 Mon Sep 17 00:00:00 2001 From: nooperation Date: Thu, 17 Jan 2019 00:41:34 -0500 Subject: [PATCH 1/2] Updating to .net 4.7.2 --- AtlasView/App.config | 8 ++++---- AtlasView/AtlasView.csproj | 2 +- AtlasView/Properties/Settings.Designer.cs | 2 +- CommonUI/CommonUI.csproj | 2 +- CommonUI/app.config | 8 ++++---- CommonUI/packages.config | 4 ++-- SanBag/App.config | 8 ++++---- SanBag/Properties/Resources.Designer.cs | 2 +- SanBag/Properties/Settings.Designer.cs | 2 +- SanBag/SanBag.csproj | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/AtlasView/App.config b/AtlasView/App.config index 37ae59f..e96aa67 100644 --- a/AtlasView/App.config +++ b/AtlasView/App.config @@ -1,13 +1,13 @@ - + - + - - + + diff --git a/AtlasView/AtlasView.csproj b/AtlasView/AtlasView.csproj index 2df2c31..c1e390e 100644 --- a/AtlasView/AtlasView.csproj +++ b/AtlasView/AtlasView.csproj @@ -13,7 +13,7 @@ WinExe AtlasView AtlasView - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/AtlasView/Properties/Settings.Designer.cs b/AtlasView/Properties/Settings.Designer.cs index 62bb046..cef4bce 100644 --- a/AtlasView/Properties/Settings.Designer.cs +++ b/AtlasView/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace AtlasView.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/CommonUI/CommonUI.csproj b/CommonUI/CommonUI.csproj index 4b8e632..3a08b8f 100644 --- a/CommonUI/CommonUI.csproj +++ b/CommonUI/CommonUI.csproj @@ -14,7 +14,7 @@ Properties CommonUI CommonUI - v4.6 + v4.7.2 512 diff --git a/CommonUI/app.config b/CommonUI/app.config index 9418c60..e4a4c1d 100644 --- a/CommonUI/app.config +++ b/CommonUI/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/CommonUI/packages.config b/CommonUI/packages.config index f39d598..4130154 100644 --- a/CommonUI/packages.config +++ b/CommonUI/packages.config @@ -10,8 +10,8 @@ - - + + \ No newline at end of file diff --git a/SanBag/App.config b/SanBag/App.config index 37ae59f..e96aa67 100644 --- a/SanBag/App.config +++ b/SanBag/App.config @@ -1,13 +1,13 @@ - + - + - - + + diff --git a/SanBag/Properties/Resources.Designer.cs b/SanBag/Properties/Resources.Designer.cs index 18db642..85a2648 100644 --- a/SanBag/Properties/Resources.Designer.cs +++ b/SanBag/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SanBag.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/SanBag/Properties/Settings.Designer.cs b/SanBag/Properties/Settings.Designer.cs index fa7cf72..0025f0f 100644 --- a/SanBag/Properties/Settings.Designer.cs +++ b/SanBag/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace SanBag.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SanBag/SanBag.csproj b/SanBag/SanBag.csproj index bcfb92b..0d01554 100644 --- a/SanBag/SanBag.csproj +++ b/SanBag/SanBag.csproj @@ -13,7 +13,7 @@ WinExe SanBag SanBag - v4.6 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 From ede1c9d577635464d6e185b6a765a882109ce465 Mon Sep 17 00:00:00 2001 From: nooperation Date: Thu, 17 Jan 2019 01:22:58 -0500 Subject: [PATCH 2/2] Updating to .net 4.7.2 --- AtlasView/AtlasView.csproj | 22 +++++++++--------- AtlasView/packages.config | 11 +++++---- CommonUI/CommonUI.csproj | 46 +++++++++++++++++++------------------- CommonUI/packages.config | 27 +++++++++++----------- SanBag/SanBag.csproj | 14 +++++------- SanBag/packages.config | 9 ++++---- 6 files changed, 61 insertions(+), 68 deletions(-) diff --git a/AtlasView/AtlasView.csproj b/AtlasView/AtlasView.csproj index c1e390e..2a84a1a 100644 --- a/AtlasView/AtlasView.csproj +++ b/AtlasView/AtlasView.csproj @@ -1,10 +1,9 @@  - - - + - + + Debug @@ -43,11 +42,11 @@ true - - ..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll + + ..\packages\LibSanBag.1.7.1\lib\net472\LibSanBag.dll - - ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll @@ -144,10 +143,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + \ No newline at end of file diff --git a/AtlasView/packages.config b/AtlasView/packages.config index 0d91852..d03812e 100644 --- a/AtlasView/packages.config +++ b/AtlasView/packages.config @@ -1,9 +1,8 @@  - - - - - - + + + + + \ No newline at end of file diff --git a/CommonUI/CommonUI.csproj b/CommonUI/CommonUI.csproj index 3a08b8f..60acd43 100644 --- a/CommonUI/CommonUI.csproj +++ b/CommonUI/CommonUI.csproj @@ -1,10 +1,9 @@  - - - + - + + Debug @@ -39,37 +38,39 @@ MinimumRecommendedRules.ruleset - - ..\packages\HelixToolkit.1.0.0\lib\portable-net45+win8+wpa81+wp8\HelixToolkit.dll + + ..\packages\HelixToolkit.2.6.0\lib\netstandard1.1\HelixToolkit.dll - - ..\packages\HelixToolkit.Wpf.1.0.0\lib\net45\HelixToolkit.Wpf.dll + + ..\packages\HelixToolkit.Wpf.2.6.0\lib\net45\HelixToolkit.Wpf.dll ..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll - - ..\packages\ICSharpCode.Decompiler.4.0.0.4509-rc1\lib\net46\ICSharpCode.Decompiler.dll + + ..\packages\ICSharpCode.Decompiler.4.0.0.4521\lib\net46\ICSharpCode.Decompiler.dll - - ..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll + + ..\packages\LibSanBag.1.7.1\lib\net472\LibSanBag.dll - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll - ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - ..\packages\WPFHexaEditor.1.2.1\lib\net45\System.ValueTuple.dll + + ..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + True + True @@ -81,7 +82,7 @@ - ..\packages\WPFHexaEditor.1.2.1\lib\net45\WPFHexaEditor.dll + ..\packages\WPFHexaEditor.1.4.0\lib\net47\WPFHexaEditor.dll @@ -250,10 +251,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + \ No newline at end of file diff --git a/CommonUI/packages.config b/CommonUI/packages.config index 4130154..a681f0e 100644 --- a/CommonUI/packages.config +++ b/CommonUI/packages.config @@ -1,17 +1,16 @@  - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/SanBag/SanBag.csproj b/SanBag/SanBag.csproj index 0d01554..2e4675d 100644 --- a/SanBag/SanBag.csproj +++ b/SanBag/SanBag.csproj @@ -1,10 +1,9 @@  - - - + + Debug @@ -43,8 +42,8 @@ true - - ..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll + + ..\packages\LibSanBag.1.7.1\lib\net472\LibSanBag.dll @@ -157,10 +156,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - - - + \ No newline at end of file diff --git a/SanBag/packages.config b/SanBag/packages.config index bde6fee..2b8cf45 100644 --- a/SanBag/packages.config +++ b/SanBag/packages.config @@ -1,8 +1,7 @@  - - - - - + + + + \ No newline at end of file