Merge pull request #25 from ejcoyle88/feature/fix_sdk_version

Feature/fix sdk version
ejcoyle88 · Jan 24, 2020 · 9b42cba · 9b42cba
2 parents e3a65d9 + 6044c6d
commit 9b42cba
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -13,10 +13,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v1
-      - name: Setup dotnet core 3.0.100 if needed
+      - name: Setup dotnet core 3.1.101 if needed
         uses: actions/[email protected]
         with:
-          dotnet-version:  3.0.100
+          dotnet-version:  3.1.101
         if: matrix.os == 'macOS-latest' || matrix.os == 'ubuntu-latest'
       - name: Build & Test
         run: |

diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ msbuild.wrn
 
 # Visual Studio 2015
 .vs/
+.idea/
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/KnowYourLimits.AspNetCore/KnowYourLimits.AspNetCore.csproj b/KnowYourLimits.AspNetCore/KnowYourLimits.AspNetCore.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Elliot Coyle</Authors>
     <Company />
@@ -13,12 +13,13 @@
     <FileVersion>2.2.0.0</FileVersion>
     <AssemblyVersion>2.2.0.0</AssemblyVersion>
     <Version>2.3.2</Version>
-    <PackageVersion>4.0.1</PackageVersion>
+    <PackageVersion>4.1.0</PackageVersion>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="SecurityCodeScan" Version="3.3.0" />
+    <PackageReference Include="SecurityCodeScan" Version="3.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/KnowYourLimits.UnitTests/KnowYourLimits.UnitTests.csproj b/KnowYourLimits.UnitTests/KnowYourLimits.UnitTests.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="SecurityCodeScan" Version="3.3.0" />
+    <PackageReference Include="SecurityCodeScan" Version="3.4.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">

diff --git a/KnowYourLimits/KnowYourLimits.csproj b/KnowYourLimits/KnowYourLimits.csproj
@@ -13,11 +13,11 @@
     <AssemblyVersion>2.0.1.0</AssemblyVersion>
     <FileVersion>2.0.1.0</FileVersion>
     <Version>2.1.0</Version>
-    <PackageVersion>4.0.1</PackageVersion>
+    <PackageVersion>4.1.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SecurityCodeScan" Version="3.3.0" />
+    <PackageReference Include="SecurityCodeScan" Version="3.4.0" />
   </ItemGroup>
 
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,4 @@ msbuild.wrn

		# Visual Studio 2015
		.vs/
		.idea/