Skip to content

Commit 17e814f

Browse files
authored
Merge pull request #2 from msx752/development
Development
2 parents ec79f5e + 2169f6d commit 17e814f

File tree

5 files changed

+32
-13
lines changed

5 files changed

+32
-13
lines changed

.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Build
2828
run: dotnet build -c Release
2929
- name: Test
30-
run: dotnet test test/SampleDotnet.RepositoryFactory.Tests/SampleDotnet.RepositoryFactory.Tests.csproj --no-build --verbosity normal
30+
run: dotnet test test/SampleDotnet.RepositoryFactory.Tests/SampleDotnet.RepositoryFactory.Tests.csproj --no-restore --verbosity normal
3131

3232
- name: publish
3333
id: SampleDotnet_RepositoryFactory

SECURITY.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ currently being supported with security updates.
77

88
| Version | Supported |
99
| ------- | ------------------ |
10-
| < 5.0 | :x: |
11-
| 5.0.x | :white_check_mark: |
10+
| < 6.0 | :x: |
1211
| 6.0.x | :white_check_mark: |
1312
| 7.0.x | :white_check_mark: |
1413

src/SampleDotnet.RepositoryFactory/SampleDotnet.RepositoryFactory.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>10.0</LangVersion>
@@ -31,8 +31,8 @@
3131
<ContinuousIntegrationBuild>True</ContinuousIntegrationBuild>
3232
<EmbedUntrackedSources>True</EmbedUntrackedSources>
3333
<Copyright>Copyright 2023</Copyright>
34-
<AssemblyVersion>1.1.0</AssemblyVersion>
35-
<Version>1.1.0</Version>
34+
<AssemblyVersion>2.0.0</AssemblyVersion>
35+
<Version>2.0.0</Version>
3636
</PropertyGroup>
3737

3838
<ItemGroup>
@@ -51,17 +51,17 @@
5151
</ItemGroup>
5252

5353
<ItemGroup>
54-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
55-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.3" />
56-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
54+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
55+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
56+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
5757
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
5858
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
59-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
60-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.3">
59+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
60+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
6161
<PrivateAssets>all</PrivateAssets>
6262
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6363
</PackageReference>
64-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
64+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
6565
<PrivateAssets>all</PrivateAssets>
6666
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6767
</PackageReference>

test/SampleDotnet.RepositoryFactory.Tests/SampleDotnet.RepositoryFactory.Tests.csproj

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,27 @@
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

9+
<ItemGroup>
10+
<None Remove="appsettings.json" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<Content Include="appsettings.json">
15+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16+
</Content>
17+
</ItemGroup>
18+
919
<ItemGroup>
1020
<ProjectReference Include="..\..\src\SampleDotnet.RepositoryFactory\SampleDotnet.RepositoryFactory.csproj" />
1121
</ItemGroup>
1222

23+
<ItemGroup>
24+
<Content Include="xunit.runner.json">
25+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
26+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
27+
</Content>
28+
</ItemGroup>
29+
1330
<ItemGroup>
1431
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
1532
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
@@ -31,7 +48,7 @@
3148
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3249
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
3350
<PackageReference Include="Moq" Version="4.18.4" />
34-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
51+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3552
</ItemGroup>
3653

3754
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

0 commit comments

Comments
 (0)