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

Jump to bottom

dotMorten lib is not needed, and this is not a bug fix. #117

Closed
wants to merge 24 commits into from
Closed

dotMorten lib is not needed, and this is not a bug fix. #117

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0af7fef
Fix Net 7 Support
mehdihaghshenas Sep 26, 2022
2c7e003
Fix InMemory
mehdihaghshenas Sep 26, 2022
7b7fe28
Add support to EF 7.0 #111
mehdihaghshenas Sep 27, 2022
9a631f2
Update Nuget package Version
mehdihaghshenas Sep 27, 2022
4065503
change version
mehdihaghshenas Sep 27, 2022
c1604e4
SomFix
mehdihaghshenas Nov 12, 2022
1a35682
Fix Migration
mehdihaghshenas Nov 12, 2022
23fdad0
Fix Package that not working with EF7.0
mehdihaghshenas Nov 13, 2022
2e0ff21
Fix version
mehdihaghshenas Nov 13, 2022
8d93340
Merge branch 'main' into main
mehdihaghshenas Nov 13, 2022
02c5b55
use offical version of Microsoft.SqlServer.Types
mehdihaghshenas Nov 13, 2022
aaabb3d
Merge branch 'main' of github.com:MehdiHaghshenas/EFCore.SqlServer.Hi…
mehdihaghshenas Nov 13, 2022
713c616
change target to net 6.0
mehdihaghshenas Nov 13, 2022
4698de9
Fix build
mehdihaghshenas Nov 13, 2022
1a05aff
fix build
mehdihaghshenas Nov 13, 2022
72ca23c
Set dotnet-version: 7.0.0
mehdihaghshenas Nov 13, 2022
74f035b
revert 7.0.100-rc.1.22431.12
mehdihaghshenas Nov 13, 2022
2c85719
Fix Tests
mehdihaghshenas Nov 13, 2022
6bb6fe7
Fix Version
mehdihaghshenas Nov 15, 2022
2b9542e
add suggestions
mehdihaghshenas Nov 15, 2022
74ea328
use naming convention
mehdihaghshenas Nov 15, 2022
88c5468
Fix Idents
mehdihaghshenas Nov 15, 2022
5d4aa64
Resolve unneeded changes
mehdihaghshenas Nov 15, 2022
091ccff
add {nameof(HierarchyId)}
mehdihaghshenas Nov 15, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: 7.0.100-rc.2.22477.23
dotnet-version: 7.0.100-rc.1.22431.12
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Copyright>© 2022 Brice Lambson, et al. All rights reserved.</Copyright>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
<Version>4.0.0-rc.2</Version>
<Version>4.0.0</Version>
<Features>strict</Features>
<LangVersion>latest</LangVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion EFCore.InMemory.HierarchyId.Test/EFCore.InMemory.HierarchyId.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion EFCore.InMemory.HierarchyId/EFCore.InMemory.HierarchyId.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-rc.2.22472.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />

mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EFCore.SqlServer.HierarchyId.Abstractions/EFCore.SqlServer.HierarchyId.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="dotMorten.Microsoft.SqlServer.Types" Version="1.5.0" />
<PackageReference Include="Microsoft.SqlServer.Types" Version="160.900.6-rc0" />
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

</Project>
14 changes: 8 additions & 6 deletions EFCore.SqlServer.HierarchyId.Test/EFCore.SqlServer.HierarchyId.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
Expand All @@ -8,11 +8,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0-rc.2.22472.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rc.2.22472.11" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-4.final" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />

mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EFCore.SqlServer.HierarchyId.Test/RelationalScaffoldingModelFactoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.SqlServer;

public class RelationalScaffoldingModelFactoryTest
{
private readonly IScaffoldingModelFactory _factory;
private readonly Microsoft.EntityFrameworkCore.Scaffolding.IScaffoldingModelFactory _factory;
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
private readonly TestOperationReporter _reporter;

private static readonly DatabaseModel Database;
Expand Down
14 changes: 7 additions & 7 deletions EFCore.SqlServer.HierarchyId.Test/Test/Models/Migrations/AnonymousArraySeedContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ public partial class {migrationName} : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{{
migrationBuilder.CreateTable(
name: ""{nameof(ConvertedTestModels)}"",
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
name: ""ConvertedTestModels"",
columns: table => new
{{
Id = table.Column<int>(type: ""int"", nullable: false),
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
HierarchyId = table.Column<{nameof(HierarchyId)}>(type: ""hierarchyid"", nullable: true),
HierarchyId = table.Column<HierarchyId>(type: ""hierarchyid"", nullable: true),
Name = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
}},
constraints: table =>
Expand All @@ -56,15 +56,15 @@ protected override void Up(MigrationBuilder migrationBuilder)
}});

migrationBuilder.CreateTable(
name: ""{nameof(TestModels)}"",
name: ""TestModels"",
columns: table => new
{{
{nameof(Patriarch.Id)} = table.Column<{nameof(HierarchyId)}>(type: ""hierarchyid"", nullable: false),
{nameof(Patriarch.Name)} = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
Id = table.Column<HierarchyId>(type: ""hierarchyid"", nullable: false),
Name = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
}},
constraints: table =>
{{
table.PrimaryKey(""PK_{nameof(TestModels)}"", x => x.{nameof(Patriarch.Id)});
table.PrimaryKey(""PK_TestModels"", x => x.Id);
}});

migrationBuilder.InsertData(
Expand Down Expand Up @@ -95,7 +95,7 @@ protected override void Down(MigrationBuilder migrationBuilder)
name: ""ConvertedTestModels"");

migrationBuilder.DropTable(
name: ""{nameof(TestModels)}"");
name: ""TestModels"");
}}
}}
}}
Expand Down
32 changes: 16 additions & 16 deletions EFCore.SqlServer.HierarchyId.Test/Test/Models/Migrations/TypedArraySeedContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,48 +43,48 @@ public partial class {migrationName} : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{{
migrationBuilder.CreateTable(
name: ""{nameof(ConvertedTestModels)}"",
name: ""ConvertedTestModels"",
columns: table => new
{{
{nameof(ConvertedPatriarch.Id)} = table.Column<int>(type: ""int"", nullable: false),
{nameof(ConvertedPatriarch.HierarchyId)} = table.Column<{nameof(HierarchyId)}>(type: ""hierarchyid"", nullable: true),
mehdihaghshenas marked this conversation as resolved.
Show resolved Hide resolved
{nameof(ConvertedPatriarch.Name)} = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
Id = table.Column<int>(type: ""int"", nullable: false),
HierarchyId = table.Column<HierarchyId>(type: ""hierarchyid"", nullable: true),
Name = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
}},
constraints: table =>
{{
table.PrimaryKey(""PK_{nameof(ConvertedTestModels)}"", x => x.{nameof(ConvertedPatriarch.Id)});
table.PrimaryKey(""PK_ConvertedTestModels"", x => x.Id);
}});

migrationBuilder.CreateTable(
name: ""{nameof(TestModels)}"",
name: ""TestModels"",
columns: table => new
{{
{nameof(Patriarch.Id)} = table.Column<{nameof(HierarchyId)}>(type: ""hierarchyid"", nullable: false),
{nameof(Patriarch.Name)} = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
Id = table.Column<HierarchyId>(type: ""hierarchyid"", nullable: false),
Name = table.Column<string>(type: ""nvarchar(max)"", nullable: true)
}},
constraints: table =>
{{
table.PrimaryKey(""PK_{nameof(TestModels)}"", x => x.{nameof(Patriarch.Id)});
table.PrimaryKey(""PK_TestModels"", x => x.Id);
}});

migrationBuilder.InsertData(
table: ""ConvertedTestModels"",
columns: new[] {{ ""Id"", ""HierarchyId"", ""Name"" }},
values: new object[,]
{{
{{ 1, {typeof(HierarchyId).FullName}.Parse(""/""), ""Eddard Stark"" }},
{{ 2, {typeof(HierarchyId).FullName}.Parse(""/1/""), ""Robb Stark"" }},
{{ 3, {typeof(HierarchyId).FullName}.Parse(""/2/""), ""Jon Snow"" }}
{{ 1, Microsoft.EntityFrameworkCore.HierarchyId.Parse(""/""), ""Eddard Stark"" }},
{{ 2, Microsoft.EntityFrameworkCore.HierarchyId.Parse(""/1/""), ""Robb Stark"" }},
{{ 3, Microsoft.EntityFrameworkCore.HierarchyId.Parse(""/2/""), ""Jon Snow"" }}
}});

migrationBuilder.InsertData(
table: ""TestModels"",
columns: new[] {{ ""Id"", ""Name"" }},
values: new object[,]
{{
{{ {typeof(HierarchyId).FullName}.Parse(""/""), ""Eddard Stark"" }},
{{ {typeof(HierarchyId).FullName}.Parse(""/1/""), ""Robb Stark"" }},
{{ {typeof(HierarchyId).FullName}.Parse(""/2/""), ""Jon Snow"" }}
{{ Microsoft.EntityFrameworkCore.HierarchyId.Parse(""/""), ""Eddard Stark"" }},
{{ Microsoft.EntityFrameworkCore.HierarchyId.Parse(""/1/""), ""Robb Stark"" }},
{{ Microsoft.EntityFrameworkCore.HierarchyId.Parse(""/2/""), ""Jon Snow"" }}
}});
}}

Expand All @@ -95,7 +95,7 @@ protected override void Down(MigrationBuilder migrationBuilder)
name: ""ConvertedTestModels"");

migrationBuilder.DropTable(
name: ""{nameof(TestModels)}"");
name: ""TestModels"");
}}
}}
}}
Expand Down
2 changes: 1 addition & 1 deletion EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rc.2.22472.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down