Merge pull request #20 from VektrexElectronicSystems/development

Development v1.2.2
VektrexElectronicSystems · Apr 27, 2022 · ceb73ac · ceb73ac
2 parents 2cb21b4 + 0506a36
commit ceb73ac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,8 +5,8 @@
    "version": "0.2.0",
    "configurations": [
         {
-            "name": ".NET Core Launch (console)",
-            "type": "coreclr",
+            "name": ".NET Launch (console)",
+            "type": "clr",
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
@@ -18,8 +18,8 @@
             "stopAtEntry": false
         },
         {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
+            "name": ".NET Attach",
+            "type": "clr",
             "request": "attach",
             "processId": "${command:pickProcess}"
         }

diff --git a/Vektrex.SpikeSafe.CSharp.Samples.sln b/Vektrex.SpikeSafe.CSharp.Samples.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32228.343
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89131658-C50D-48B8-A582-2EF9DBD45E06}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vektrex.SpikeSafe.CSharp.Samples", "src\Vektrex.SpikeSafe.CSharp.Samples\Vektrex.SpikeSafe.CSharp.Samples.csproj", "{17779173-4C6A-4D7A-B352-7B7C54C16E55}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vektrex.SpikeSafe.CSharp.Samples", "src\Vektrex.SpikeSafe.CSharp.Samples\Vektrex.SpikeSafe.CSharp.Samples.csproj", "{17779173-4C6A-4D7A-B352-7B7C54C16E55}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,9 +16,6 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{17779173-4C6A-4D7A-B352-7B7C54C16E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17779173-4C6A-4D7A-B352-7B7C54C16E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -33,7 +30,13 @@ Global
 		{17779173-4C6A-4D7A-B352-7B7C54C16E55}.Release|x86.ActiveCfg = Release|Any CPU
 		{17779173-4C6A-4D7A-B352-7B7C54C16E55}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{17779173-4C6A-4D7A-B352-7B7C54C16E55} = {89131658-C50D-48B8-A582-2EF9DBD45E06}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B5590C21-8E76-46D3-AC68-8428B1A08DCF}
+	EndGlobalSection
 EndGlobal
diff --git a/src/Vektrex.SpikeSafe.CSharp.Samples/README.md b/src/Vektrex.SpikeSafe.CSharp.Samples/README.md
@@ -21,7 +21,7 @@ To run these samples an IDE such as [Visual Studio Code](https://code.visualstud
 The [.NET Framework 4.8 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net48) need to be installed.
 
 ### Installing Vektrex.SpikeSafe.CSharp.Lib Package
-The [Vektrex.SpikeSafe.CSharp.Lib](https://www.nuget.org/packages/Vektrex.SpikeSafe.CSharp.Lib/) package will need to be installed using the command `Install-Package Vektrex.SpikeSafe.CSharp.Lib`. Vektrex recommends always having the latest version of Vektrex.SpikeSafe.CSharp.Lib when running these sequences; the current version is 1.1.1.
+The [Vektrex.SpikeSafe.CSharp.Lib](https://www.nuget.org/packages/Vektrex.SpikeSafe.CSharp.Lib/) package will need to be installed using the command `Install-Package Vektrex.SpikeSafe.CSharp.Lib`. Vektrex recommends always having the latest version of Vektrex.SpikeSafe.CSharp.Lib when running these sequences; the current version is 1.2.0.
 
 Once the Vektrex.SpikeSafe.CSharp.Lib package is installed, each sample can be run independently by commenting out its respectively 'Run()' line in Program.cs. When a sample is run verify the expected outputs are obtained, as specified by the file's markdown description.
 

diff --git a/src/Vektrex.SpikeSafe.CSharp.Samples/Vektrex.SpikeSafe.CSharp.Samples.csproj b/src/Vektrex.SpikeSafe.CSharp.Samples/Vektrex.SpikeSafe.CSharp.Samples.csproj
@@ -2,12 +2,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net48</TargetFramework>
-    <Version>1.2.0</Version>
+    <Version>1.2.2</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ScottPlot" Version="4.1.16"/>
-    <PackageReference Include="NLog" Version="4.7.10"/>
-    <PackageReference Include="Vektrex.SpikeSafe.CSharp.Lib" Version="1.1.1"/>
-    <None Include="nlog.config" CopyToOutputDirectory="Always"/>
+    <PackageReference Include="ScottPlot" Version="4.1.16" />
+    <PackageReference Include="NLog" Version="4.7.10" />
+    <PackageReference Include="Vektrex.SpikeSafe.CSharp.Lib" Version="1.2.0" />
+    <None Include="nlog.config" CopyToOutputDirectory="Always" />
   </ItemGroup>
 </Project>