Skip to content

Commit

Permalink
Merge pull request #12 from polyadic/dotnet-7
Browse files Browse the repository at this point in the history
  • Loading branch information
bash authored Nov 16, 2022
2 parents e0d3bfa + d1345eb commit ada9fe6
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 31 deletions.
24 changes: 24 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup Label="Runtime Dependencies">
<PackageVersion Include="Funcky" Version="[3.0.0, 4)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[3.1.25, 8)" />
</ItemGroup>
<ItemGroup Label="Build Dependencies">
<PackageVersion Include="Funcky.Analyzers" Version="1.1.0" />
<PackageVersion Include="Messerli.CodeStyle" Version="2.1.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
<ItemGroup Label="Test Dependencies">
<PackageVersion Include="Funcky.Xunit" Version="2.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="[3.1.25, 6)" Condition="'$(EntityFrameworkCoreVersion)' == ''" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageVersion Include="xunit" Version="2.4.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
Expand Down
3 changes: 2 additions & 1 deletion Funcky.EntityFrameworkCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
global.json = global.json
Packages.props = Packages.props
Directory.Packages.props = Directory.Packages.props
NuGet.config = NuGet.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funcky.EntityFrameworkCore", "Funcky.EntityFrameworkCore\Funcky.EntityFrameworkCore.csproj", "{BB5D39BA-57A3-4C41-BDB8-77CA97D0EBC9}"
Expand Down
4 changes: 2 additions & 2 deletions Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<LangVersion>11.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Product>Interoperability between Funcky and EF Core</Product>
Expand Down
12 changes: 12 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
21 changes: 0 additions & 21 deletions Packages.props

This file was deleted.

5 changes: 1 addition & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"sdk": {
"version": "6.0.201",
"version": "7.0.100",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.1.3"
}
}

0 comments on commit ada9fe6

Please sign in to comment.