Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fix sdk version #25

Merged
merged 3 commits into from
Jan 24, 2020
Merged

Feature/fix sdk version #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de3e52
Updating package version
Jan 24, 2020
6259175
Adding .idea to gitignore
Jan 24, 2020
6044c6d
Update dotnetcore.yml
ejcoyle88 Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dotnetcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ msbuild.wrn

# Visual Studio 2015
.vs/
.idea/
2 changes: 2 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions KnowYourLimits.AspNetCore/KnowYourLimits.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 />
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion KnowYourLimits.UnitTests/KnowYourLimits.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down
4 changes: 2 additions & 2 deletions KnowYourLimits/KnowYourLimits.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>