dev合并到snow

dotnetcore · Oct 2, 2023 · a742678 · a742678
2 parents 1995fcd + 661dec4
commit a742678
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/build/version.props b/build/version.props
@@ -4,9 +4,9 @@
     <VersionPrefix>11</VersionPrefix>
     <VersionSuffix>-preview.</VersionSuffix>
     <VersionSuffixVersion>1001</VersionSuffixVersion>
-    <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
-    <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
-    <!--<Version>$(VersionMain).$(VersionPrefix)</Version>
-    <FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>-->
+    <!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
+    <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>-->
+    <Version>$(VersionMain).$(VersionPrefix)</Version>
+    <FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>
   </PropertyGroup>
 </Project>
diff --git a/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj b/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj
@@ -4,7 +4,7 @@
   <Import Project="../../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Liuliu.Demo.Web</RootNamespace>
     <UserSecretsId>38c51dba-31f4-4c29-a3b3-49164e38d32f</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -55,11 +55,6 @@
     <ProjectReference Include="..\..\..\src\OSharp.Swagger\OSharp.Swagger.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.MySql\OSharp.EntityFrameworkCore.MySql.csproj" />
-    <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Migrations\" />
   </ItemGroup>

diff --git a/samples/web/Liuliu.Demo.WebApi/Startups/MySqlDefaultDbContextMigrationPack.cs b/samples/web/Liuliu.Demo.WebApi/Startups/MySqlDefaultDbContextMigrationPack.cs
@@ -45,4 +45,4 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
             return new DesignTimeDefaultDbContextFactory(scopedProvider).CreateDbContext(new string[0]);
         }
     }
-}
+}
diff --git a/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs b/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs
@@ -46,4 +46,4 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
             return new DesignTimeDefaultDbContextFactory(scopedProvider).CreateDbContext(new string[0]);
         }
     }
-}
+}
diff --git a/samples/web/Liuliu.Demo.WebApi/appsettings.Development.json b/samples/web/Liuliu.Demo.WebApi/appsettings.Development.json
@@ -127,7 +127,7 @@
     },
     "Redis": {
       "Configuration": "localhost",
-      "InstanceName": "Liuliu.Demo:"
+      "InstanceName": "Liuliu.Demo.Dev:"
     },
     "Swagger": {
       "Endpoints": [
-Original file line number
+Diff line change
@@ Expand Up @@
                 return new DesignTimeDefaultDbContextFactory(scopedProvider).CreateDbContext(new string[0]);
             }
         }
-    }
+    }