Merge pull request #3 from shashinma/dev

Dev
akinin · Nov 28, 2023 · 7e38830 · 7e38830
2 parents a968bb1 + fe45c86
commit 7e38830
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 10 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 ## files generated by popular Visual Studio add-ons.
 
 .DS_Store
-*.db
+*.db*
+!*.db
 
 # User-specific files
 *.suo

diff --git a/IdentityContext.db b/IdentityContext.db
diff --git a/PhoneBookContext.db b/PhoneBookContext.db
diff --git a/PhoneEdit.csproj b/PhoneEdit.csproj
@@ -19,12 +19,6 @@
         <PackageReference Include="X.PagedList.Mvc.Core" Version="8.4.7" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Content Include="..\.dockerignore">
-        <Link>.dockerignore</Link>
-      </Content>
-    </ItemGroup>
-
     <ItemGroup>
       <_ContentIncludedByDefault Remove="Views\Home\Index.cshtml" />
       <_ContentIncludedByDefault Remove="Views\Home\Privacy.cshtml" />

diff --git a/Program.cs b/Program.cs
@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using MySql.Data.MySqlClient;
 using PhoneEdit.Data;
-using Microsoft.Extensions.DependencyInjection;
 using PhoneEdit.Helpers;
 
 var builder = WebApplication.CreateBuilder(args);

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
@@ -13,7 +13,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5087",
+      "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -22,7 +22,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:7289;http://localhost:5087",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,8 @@ @@
     ## files generated by popular Visual Studio add-ons.
     .DS_Store
-    *.db
+    *.db*
+    !*.db
     # User-specific files
     *.suo
@@ Expand Down @@