Skip to content

Commit

Permalink
Merge pull request #74 from AutoMapper/2Dot0Dot3Preview0
Browse files Browse the repository at this point in the history
Sample projects to latest.
  • Loading branch information
BlaiseD authored Nov 2, 2020
2 parents 7ece98d + 6f35d55 commit 2fcb669
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion MigrationTool/MigrationContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class MigrationContext : DbContext
{
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.UseSqlServer(@"Server=.\SQL2014;Database=YourDB;Trusted_Connection=True;");
optionsBuilder.UseSqlServer(@"Server=.\SQL2016;Database=YourDB;Trusted_Connection=True;");
}

public DbSet<TMandator> MandatorSet { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion SeedDatabase/appsettings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=.\\SQL2014;Database=YourDB;Trusted_Connection=True;"
"DefaultConnection": "Server=.\\SQL2016;Database=YourDB;Trusted_Connection=True;"
}
}
2 changes: 1 addition & 1 deletion WebAPI.AspNet.OData.EF6/App_Start/WebApiConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void Register(HttpConfiguration config)
defaults: new { id = RouteParameter.Optional }
);

DAL.MyDbContext.DSN = @"data source=.\SQL2014;initial catalog=Issue3;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework";//"Data Source=adeaeawe;Initial Catalog=aeaweawe;User ID=aeaweads;Password=aweasdawae; MultipleActiveResultSets=True";
DAL.MyDbContext.DSN = @"data source=.\SQL2016;initial catalog=YourDB;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework";//"Data Source=adeaeawe;Initial Catalog=aeaweawe;User ID=aeaweads;Password=aweasdawae; MultipleActiveResultSets=True";

config.Count().Filter().OrderBy().Expand().Select().MaxTop(null);

Expand Down
2 changes: 1 addition & 1 deletion WebAPI.AspNet.OData.EF6/WebAPI.AspNet.OData.EF6.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<HintPath>..\packages\AutoMapper.10.0.0\lib\net461\AutoMapper.dll</HintPath>
</Reference>
<Reference Include="AutoMapper.AspNet.OData.EF6, Version=2.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.AspNet.OData.EF6.2.0.2\lib\net461\AutoMapper.AspNet.OData.EF6.dll</HintPath>
<HintPath>..\packages\AutoMapper.AspNet.OData.EF6.2.0.3-alpha.0.5\lib\net461\AutoMapper.AspNet.OData.EF6.dll</HintPath>
</Reference>
<Reference Include="AutoMapper.Extensions.ExpressionMapping, Version=4.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.Extensions.ExpressionMapping.4.0.2\lib\net461\AutoMapper.Extensions.ExpressionMapping.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion WebAPI.AspNet.OData.EF6/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="10.0.0" targetFramework="net472" />
<package id="AutoMapper.AspNet.OData.EF6" version="2.0.2" targetFramework="net472" />
<package id="AutoMapper.AspNet.OData.EF6" version="2.0.3-alpha.0.5" targetFramework="net472" />
<package id="AutoMapper.Extensions.ExpressionMapping" version="4.0.2" targetFramework="net472" />
<package id="EntityFramework" version="6.2.0" targetFramework="net472" />
<package id="LogicBuilder.Expressions.Utils" version="4.0.2" targetFramework="net472" />
Expand Down
2 changes: 1 addition & 1 deletion WebAPI.OData.EFCore/WebAPI.OData.EFCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper.AspNetCore.OData.EFCore" Version="2.0.2" />
<PackageReference Include="AutoMapper.AspNetCore.OData.EFCore" Version="2.0.3-alpha.0.5" />
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="4.0.2" />
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.4.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1" />
Expand Down
2 changes: 1 addition & 1 deletion WebAPI.OData.EFCore/appsettings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=.\\SQL2014;Database=Issue3;Trusted_Connection=True;"
"DefaultConnection": "Server=.\\SQL2016;Database=YourDB;Trusted_Connection=True;"
},
"Logging": {
"LogLevel": {
Expand Down

0 comments on commit 2fcb669

Please sign in to comment.