diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj index 016f089..bbb974c 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj @@ -8,7 +8,7 @@ WinExe Novetus.Bootstrapper NovetusBootstrapper - v4.8.1 + v4.8 512 false diff --git a/Novetus/Novetus.Bootstrapper/app.config b/Novetus/Novetus.Bootstrapper/app.config index eca069e..3e0e37c 100644 --- a/Novetus/Novetus.Bootstrapper/app.config +++ b/Novetus/Novetus.Bootstrapper/app.config @@ -1,3 +1,3 @@ - + diff --git a/Novetus/Novetus.Bootstrapper/packages.config b/Novetus/Novetus.Bootstrapper/packages.config index e900644..7a37563 100644 --- a/Novetus/Novetus.Bootstrapper/packages.config +++ b/Novetus/Novetus.Bootstrapper/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj index f289c5f..d365fc1 100644 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj @@ -8,8 +8,9 @@ WinExe Novetus.ClientScriptTester ClientScriptTester - v4.0 + v4.8 512 + AnyCPU @@ -20,6 +21,7 @@ TRACE;DEBUG;TESTER;NOVETUS_APPS;NET481 prompt 4 + false AnyCPU @@ -29,6 +31,7 @@ TRACE;TESTER;NOVETUS_APPS;NET481 prompt 4 + false NovetusIcon.ico @@ -74,6 +77,7 @@ True Resources.resx + True diff --git a/Novetus/Novetus.ClientScriptTester/Properties/Resources.Designer.cs b/Novetus/Novetus.ClientScriptTester/Properties/Resources.Designer.cs index 3e9b7a8..8ac6056 100644 --- a/Novetus/Novetus.ClientScriptTester/Properties/Resources.Designer.cs +++ b/Novetus/Novetus.ClientScriptTester/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Novetus.ClientScriptTester.Properties -{ - - +namespace Novetus.ClientScriptTester.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace Novetus.ClientScriptTester.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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Novetus.ClientScriptTester.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Novetus/Novetus.ClientScriptTester/Properties/Settings.Designer.cs b/Novetus/Novetus.ClientScriptTester/Properties/Settings.Designer.cs index 564f332..42f97fc 100644 --- a/Novetus/Novetus.ClientScriptTester/Properties/Settings.Designer.cs +++ b/Novetus/Novetus.ClientScriptTester/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace Novetus.ClientScriptTester.Properties -{ - - +namespace Novetus.ClientScriptTester.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Novetus/Novetus.ClientScriptTester/app.config b/Novetus/Novetus.ClientScriptTester/app.config index 1f8f1a2..da4575c 100644 --- a/Novetus/Novetus.ClientScriptTester/app.config +++ b/Novetus/Novetus.ClientScriptTester/app.config @@ -1,19 +1,19 @@ - + - + - - + + - - + + - + - \ No newline at end of file + diff --git a/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net481.csproj b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net481.csproj index ff4481a..5c14202 100644 --- a/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net481.csproj +++ b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net481.csproj @@ -8,9 +8,10 @@ Exe Novetus.ReleasePreparer ReleasePreparer - v4.0 + v4.8 512 false + AnyCPU @@ -21,6 +22,7 @@ TRACE;DEBUG;PREPARER;NET481 prompt 4 + false AnyCPU @@ -30,6 +32,7 @@ TRACE;PREPARER;NET481 prompt 4 + false NovetusIcon.ico @@ -53,6 +56,9 @@ + + + SET path=$(SolutionDir)build diff --git a/Novetus/Novetus.ReleasePreparer/app.config b/Novetus/Novetus.ReleasePreparer/app.config new file mode 100644 index 0000000..3e0e37c --- /dev/null +++ b/Novetus/Novetus.ReleasePreparer/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Novetus/Novetus.Tools.Net481.sln b/Novetus/Novetus.Tools.Net481.sln index ffc0ea5..6b787cf 100644 --- a/Novetus/Novetus.Tools.Net481.sln +++ b/Novetus/Novetus.Tools.Net481.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ClientScriptTester", "Novetus.ClientScriptTester\Novetus.ClientScriptTester.csproj", "{83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ReleasePreparer.Net481", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\Novetus.ReleasePreparer\Novetus.ReleasePreparer.Net481.csproj", "{64A99062-3C1C-4D2E-99E4-D6D92443AC98}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ReleasePreparer", "Novetus.ReleasePreparer\Novetus.ReleasePreparer.csproj", "{64A99062-3C1C-4D2E-99E4-D6D92443AC98}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ClientScriptTester.Net481", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\Novetus.ClientScriptTester\Novetus.ClientScriptTester.Net481.csproj", "{83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,26 +13,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Release|Any CPU.Build.0 = Release|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Release|Any CPU.Build.0 = Release|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.Build.0 = Release|Any CPU {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.Build.0 = Release|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Release|Any CPU.Build.0 = Release|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj index 1e55d4e..f7c5f3e 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj @@ -7,7 +7,7 @@ WinExe NovetusLauncher Novetus - v4.8.1 + v4.8 Properties diff --git a/Novetus/NovetusLauncher/app.config b/Novetus/NovetusLauncher/app.config index 8103af1..b1e96f4 100644 --- a/Novetus/NovetusLauncher/app.config +++ b/Novetus/NovetusLauncher/app.config @@ -1,7 +1,7 @@ - + diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config index 8dbfd32..d7ea284 100644 --- a/Novetus/NovetusLauncher/packages.config +++ b/Novetus/NovetusLauncher/packages.config @@ -1,9 +1,9 @@  - + - + \ No newline at end of file diff --git a/Novetus/NovetusURI/App.config b/Novetus/NovetusURI/App.config index e60cfaa..b767554 100644 --- a/Novetus/NovetusURI/App.config +++ b/Novetus/NovetusURI/App.config @@ -1,7 +1,7 @@ - + diff --git a/Novetus/NovetusURI/Novetus.URI.Net481.csproj b/Novetus/NovetusURI/Novetus.URI.Net481.csproj index 82f63d7..6e4d0b9 100644 --- a/Novetus/NovetusURI/Novetus.URI.Net481.csproj +++ b/Novetus/NovetusURI/Novetus.URI.Net481.csproj @@ -9,7 +9,7 @@ Properties NovetusURI NovetusURI - v4.8.1 + v4.8 512 true diff --git a/Novetus/NovetusURI/packages.config b/Novetus/NovetusURI/packages.config index 9e5c6cb..d942e89 100644 --- a/Novetus/NovetusURI/packages.config +++ b/Novetus/NovetusURI/packages.config @@ -1,8 +1,8 @@  - + - + \ No newline at end of file diff --git a/Novetus_SolutionLoader.bat b/Novetus_SolutionLoader.bat index 05bb5ed..c2f1763 100644 --- a/Novetus_SolutionLoader.bat +++ b/Novetus_SolutionLoader.bat @@ -31,8 +31,8 @@ ECHO Which solution do you wish to load? ECHO. ECHO 1 - Novetus (.NET Framework 4.0) ECHO 2 - Novetus.Tools (.NET Framework 4.0) -ECHO 3 - Novetus (.NET Framework 4.8.1) -ECHO 4 - Novetus.Tools (.NET Framework 4.8.1) +ECHO 3 - Novetus (.NET Framework 4.8) +ECHO 4 - Novetus.Tools (.NET Framework 4.8) ECHO 5 - EXIT ECHO. SET /P M=Option: