diff --git a/Dockerfile b/Dockerfile index 556f93d..a1ae24f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,18 @@ FROM microsoft/dotnet:2.1-sdk AS build WORKDIR /app - -# copy csproj and restore as distinct layers COPY *.sln . -COPY *.csproj ./aspnetapp/ +COPY angularapp/*.csproj ./angularapp/ RUN dotnet restore -# copy everything else and build app -COPY ./ ./aspnetapp/ -WORKDIR /app/aspnetapp +COPY angularapp/ ./angularapp/ +WORKDIR /app/angularapp +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && apt-get install -y nodejs RUN dotnet publish -c Release -o out FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime WORKDIR /app -COPY --from=build /app/aspnetapp/out ./ +COPY --from=build /app/angularapp/out ./ ENTRYPOINT ["dotnet", "dotnet-angular.dll"] + diff --git a/ClientApp/.angular-cli.json b/angularapp/ClientApp/.angular-cli.json similarity index 100% rename from ClientApp/.angular-cli.json rename to angularapp/ClientApp/.angular-cli.json diff --git a/ClientApp/.editorconfig b/angularapp/ClientApp/.editorconfig similarity index 100% rename from ClientApp/.editorconfig rename to angularapp/ClientApp/.editorconfig diff --git a/ClientApp/.gitignore b/angularapp/ClientApp/.gitignore similarity index 100% rename from ClientApp/.gitignore rename to angularapp/ClientApp/.gitignore diff --git a/ClientApp/README.md b/angularapp/ClientApp/README.md similarity index 100% rename from ClientApp/README.md rename to angularapp/ClientApp/README.md diff --git a/ClientApp/e2e/app.e2e-spec.ts b/angularapp/ClientApp/e2e/app.e2e-spec.ts similarity index 100% rename from ClientApp/e2e/app.e2e-spec.ts rename to angularapp/ClientApp/e2e/app.e2e-spec.ts diff --git a/ClientApp/e2e/app.po.ts b/angularapp/ClientApp/e2e/app.po.ts similarity index 100% rename from ClientApp/e2e/app.po.ts rename to angularapp/ClientApp/e2e/app.po.ts diff --git a/ClientApp/e2e/tsconfig.e2e.json b/angularapp/ClientApp/e2e/tsconfig.e2e.json similarity index 100% rename from ClientApp/e2e/tsconfig.e2e.json rename to angularapp/ClientApp/e2e/tsconfig.e2e.json diff --git a/ClientApp/karma.conf.js b/angularapp/ClientApp/karma.conf.js similarity index 100% rename from ClientApp/karma.conf.js rename to angularapp/ClientApp/karma.conf.js diff --git a/ClientApp/package-lock.json b/angularapp/ClientApp/package-lock.json similarity index 100% rename from ClientApp/package-lock.json rename to angularapp/ClientApp/package-lock.json diff --git a/ClientApp/package.json b/angularapp/ClientApp/package.json similarity index 100% rename from ClientApp/package.json rename to angularapp/ClientApp/package.json diff --git a/ClientApp/protractor.conf.js b/angularapp/ClientApp/protractor.conf.js similarity index 100% rename from ClientApp/protractor.conf.js rename to angularapp/ClientApp/protractor.conf.js diff --git a/ClientApp/src/app/app.component.css b/angularapp/ClientApp/src/app/app.component.css similarity index 100% rename from ClientApp/src/app/app.component.css rename to angularapp/ClientApp/src/app/app.component.css diff --git a/ClientApp/src/app/app.component.html b/angularapp/ClientApp/src/app/app.component.html similarity index 100% rename from ClientApp/src/app/app.component.html rename to angularapp/ClientApp/src/app/app.component.html diff --git a/ClientApp/src/app/app.component.ts b/angularapp/ClientApp/src/app/app.component.ts similarity index 100% rename from ClientApp/src/app/app.component.ts rename to angularapp/ClientApp/src/app/app.component.ts diff --git a/ClientApp/src/app/app.module.ts b/angularapp/ClientApp/src/app/app.module.ts similarity index 100% rename from ClientApp/src/app/app.module.ts rename to angularapp/ClientApp/src/app/app.module.ts diff --git a/ClientApp/src/app/counter/counter.component.html b/angularapp/ClientApp/src/app/counter/counter.component.html similarity index 100% rename from ClientApp/src/app/counter/counter.component.html rename to angularapp/ClientApp/src/app/counter/counter.component.html diff --git a/ClientApp/src/app/counter/counter.component.spec.ts b/angularapp/ClientApp/src/app/counter/counter.component.spec.ts similarity index 100% rename from ClientApp/src/app/counter/counter.component.spec.ts rename to angularapp/ClientApp/src/app/counter/counter.component.spec.ts diff --git a/ClientApp/src/app/counter/counter.component.ts b/angularapp/ClientApp/src/app/counter/counter.component.ts similarity index 100% rename from ClientApp/src/app/counter/counter.component.ts rename to angularapp/ClientApp/src/app/counter/counter.component.ts diff --git a/ClientApp/src/app/fetch-data/fetch-data.component.html b/angularapp/ClientApp/src/app/fetch-data/fetch-data.component.html similarity index 100% rename from ClientApp/src/app/fetch-data/fetch-data.component.html rename to angularapp/ClientApp/src/app/fetch-data/fetch-data.component.html diff --git a/ClientApp/src/app/fetch-data/fetch-data.component.ts b/angularapp/ClientApp/src/app/fetch-data/fetch-data.component.ts similarity index 100% rename from ClientApp/src/app/fetch-data/fetch-data.component.ts rename to angularapp/ClientApp/src/app/fetch-data/fetch-data.component.ts diff --git a/ClientApp/src/app/home/home.component.html b/angularapp/ClientApp/src/app/home/home.component.html similarity index 100% rename from ClientApp/src/app/home/home.component.html rename to angularapp/ClientApp/src/app/home/home.component.html diff --git a/ClientApp/src/app/home/home.component.ts b/angularapp/ClientApp/src/app/home/home.component.ts similarity index 100% rename from ClientApp/src/app/home/home.component.ts rename to angularapp/ClientApp/src/app/home/home.component.ts diff --git a/ClientApp/src/app/nav-menu/nav-menu.component.css b/angularapp/ClientApp/src/app/nav-menu/nav-menu.component.css similarity index 100% rename from ClientApp/src/app/nav-menu/nav-menu.component.css rename to angularapp/ClientApp/src/app/nav-menu/nav-menu.component.css diff --git a/ClientApp/src/app/nav-menu/nav-menu.component.html b/angularapp/ClientApp/src/app/nav-menu/nav-menu.component.html similarity index 100% rename from ClientApp/src/app/nav-menu/nav-menu.component.html rename to angularapp/ClientApp/src/app/nav-menu/nav-menu.component.html diff --git a/ClientApp/src/app/nav-menu/nav-menu.component.ts b/angularapp/ClientApp/src/app/nav-menu/nav-menu.component.ts similarity index 100% rename from ClientApp/src/app/nav-menu/nav-menu.component.ts rename to angularapp/ClientApp/src/app/nav-menu/nav-menu.component.ts diff --git a/ClientApp/src/assets/.gitkeep b/angularapp/ClientApp/src/assets/.gitkeep similarity index 100% rename from ClientApp/src/assets/.gitkeep rename to angularapp/ClientApp/src/assets/.gitkeep diff --git a/ClientApp/src/environments/environment.prod.ts b/angularapp/ClientApp/src/environments/environment.prod.ts similarity index 100% rename from ClientApp/src/environments/environment.prod.ts rename to angularapp/ClientApp/src/environments/environment.prod.ts diff --git a/ClientApp/src/environments/environment.ts b/angularapp/ClientApp/src/environments/environment.ts similarity index 100% rename from ClientApp/src/environments/environment.ts rename to angularapp/ClientApp/src/environments/environment.ts diff --git a/ClientApp/src/index.html b/angularapp/ClientApp/src/index.html similarity index 100% rename from ClientApp/src/index.html rename to angularapp/ClientApp/src/index.html diff --git a/ClientApp/src/main.ts b/angularapp/ClientApp/src/main.ts similarity index 100% rename from ClientApp/src/main.ts rename to angularapp/ClientApp/src/main.ts diff --git a/ClientApp/src/polyfills.ts b/angularapp/ClientApp/src/polyfills.ts similarity index 100% rename from ClientApp/src/polyfills.ts rename to angularapp/ClientApp/src/polyfills.ts diff --git a/ClientApp/src/styles.css b/angularapp/ClientApp/src/styles.css similarity index 100% rename from ClientApp/src/styles.css rename to angularapp/ClientApp/src/styles.css diff --git a/ClientApp/src/test.ts b/angularapp/ClientApp/src/test.ts similarity index 100% rename from ClientApp/src/test.ts rename to angularapp/ClientApp/src/test.ts diff --git a/ClientApp/src/tsconfig.app.json b/angularapp/ClientApp/src/tsconfig.app.json similarity index 100% rename from ClientApp/src/tsconfig.app.json rename to angularapp/ClientApp/src/tsconfig.app.json diff --git a/ClientApp/src/tsconfig.spec.json b/angularapp/ClientApp/src/tsconfig.spec.json similarity index 100% rename from ClientApp/src/tsconfig.spec.json rename to angularapp/ClientApp/src/tsconfig.spec.json diff --git a/ClientApp/src/typings.d.ts b/angularapp/ClientApp/src/typings.d.ts similarity index 100% rename from ClientApp/src/typings.d.ts rename to angularapp/ClientApp/src/typings.d.ts diff --git a/ClientApp/tsconfig.json b/angularapp/ClientApp/tsconfig.json similarity index 100% rename from ClientApp/tsconfig.json rename to angularapp/ClientApp/tsconfig.json diff --git a/ClientApp/tslint.json b/angularapp/ClientApp/tslint.json similarity index 100% rename from ClientApp/tslint.json rename to angularapp/ClientApp/tslint.json diff --git a/Controllers/SampleDataController.cs b/angularapp/Controllers/SampleDataController.cs similarity index 100% rename from Controllers/SampleDataController.cs rename to angularapp/Controllers/SampleDataController.cs diff --git a/Pages/Error.cshtml b/angularapp/Pages/Error.cshtml similarity index 100% rename from Pages/Error.cshtml rename to angularapp/Pages/Error.cshtml diff --git a/Pages/Error.cshtml.cs b/angularapp/Pages/Error.cshtml.cs similarity index 100% rename from Pages/Error.cshtml.cs rename to angularapp/Pages/Error.cshtml.cs diff --git a/Pages/_ViewImports.cshtml b/angularapp/Pages/_ViewImports.cshtml similarity index 100% rename from Pages/_ViewImports.cshtml rename to angularapp/Pages/_ViewImports.cshtml diff --git a/Program.cs b/angularapp/Program.cs similarity index 100% rename from Program.cs rename to angularapp/Program.cs diff --git a/angularapp/Properties/launchSettings.json b/angularapp/Properties/launchSettings.json new file mode 100644 index 0000000..e72bc2b --- /dev/null +++ b/angularapp/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:2958", + "sslPort": 44372 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "dotnet_angular": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/Startup.cs b/angularapp/Startup.cs similarity index 100% rename from Startup.cs rename to angularapp/Startup.cs diff --git a/appsettings.Development.json b/angularapp/appsettings.Development.json similarity index 100% rename from appsettings.Development.json rename to angularapp/appsettings.Development.json diff --git a/appsettings.json b/angularapp/appsettings.json similarity index 100% rename from appsettings.json rename to angularapp/appsettings.json diff --git a/dotnet-angular.csproj b/angularapp/dotnet-angular.csproj similarity index 100% rename from dotnet-angular.csproj rename to angularapp/dotnet-angular.csproj diff --git a/wwwroot/favicon.ico b/angularapp/wwwroot/favicon.ico similarity index 100% rename from wwwroot/favicon.ico rename to angularapp/wwwroot/favicon.ico diff --git a/dotnet-angular.sln b/dotnet-angular.sln new file mode 100644 index 0000000..ed0e865 --- /dev/null +++ b/dotnet-angular.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-angular", "angularapp\dotnet-angular.csproj", "{D6A28F39-6D71-4A39-B711-0DE4F6E42827}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x64.ActiveCfg = Debug|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x64.Build.0 = Debug|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x86.ActiveCfg = Debug|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x86.Build.0 = Debug|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|Any CPU.Build.0 = Release|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x64.ActiveCfg = Release|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x64.Build.0 = Release|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x86.ActiveCfg = Release|Any CPU + {D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal