diff options
| author | Javier Calvarro Nelson <jacalvar@microsoft.com> | 2022-07-08 19:05:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-08 19:05:11 +0300 |
| commit | 89f79d4809fa0f25851701bec25cfa9df7cec444 (patch) | |
| tree | 7da1a610912769db91061cfe8fb82e6eeafc828a | |
| parent | a20ae680a7d009a1441dc63b64f0c936af81090e (diff) | |
Revert "Improve multi-stage image build support. (#58)" (#63)
This reverts commit a20ae680a7d009a1441dc63b64f0c936af81090e.
| -rw-r--r-- | src/Angular-CSharp.csproj.in | 11 | ||||
| -rw-r--r-- | src/React-CSharp.csproj.in | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/Angular-CSharp.csproj.in b/src/Angular-CSharp.csproj.in index 8d8c646..3026e53 100644 --- a/src/Angular-CSharp.csproj.in +++ b/src/Angular-CSharp.csproj.in @@ -7,11 +7,9 @@ <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile> <!--#if (!NoSpaFrontEnd) --> <SpaRoot>ClientApp\</SpaRoot> - <SpaInstallCommand>npm install</SpaInstallCommand> - <SpaBuildCommand>npm run build</SpaBuildCommand> - <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand> <SpaProxyServerUrl Condition="'$(RequiresHttps)' == 'True'">https://localhost:5002</SpaProxyServerUrl> <SpaProxyServerUrl Condition="'$(RequiresHttps)' != 'True'">http://localhost:5002</SpaProxyServerUrl> + <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand> <!--#endif --> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace> <ImplicitUsings>enable</ImplicitUsings> @@ -48,15 +46,14 @@ </Exec> <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." /> <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." /> - <Exec WorkingDirectory="$(SpaRoot)" Command="$(SpaInstallCommand)" /> + <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> </Target> <!--/+:cnd:noEmit --> <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish"> <!-- As part of publishing, ensure the JS resources are freshly built in production mode --> - <SkipSpaBuild Condition="'$(DOTNET_RUNNING_IN_CONTAINER)' == 'true'">True</SkipSpaBuild> - <Exec WorkingDirectory="$(SpaRoot)" Command="$(SpaInstallCommand)" Condition="'$(SkipSpaBuild)' != 'True'" /> - <Exec WorkingDirectory="$(SpaRoot)" Command="$(SpaBuildCommand)" Condition="'$(SkipSpaBuild)' != 'True'" /> + <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> + <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --configuration production" /> <!-- Include the newly-built files in the publish output --> <ItemGroup> diff --git a/src/React-CSharp.csproj.in b/src/React-CSharp.csproj.in index 7510d29..04554a0 100644 --- a/src/React-CSharp.csproj.in +++ b/src/React-CSharp.csproj.in @@ -9,12 +9,10 @@ <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile> <!--#if (!NoSpaFrontEnd) --> <SpaRoot>ClientApp\</SpaRoot> - <SpaInstallCommand>npm install</SpaInstallCommand> - <SpaBuildCommand>npm run build</SpaBuildCommand> - <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand> <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes> <SpaProxyServerUrl Condition="'$(RequiresHttps)' == 'True'">https://localhost:5002</SpaProxyServerUrl> <SpaProxyServerUrl Condition="'$(RequiresHttps)' != 'True'">http://localhost:5002</SpaProxyServerUrl> + <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand> <!--#endif --> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace> <ImplicitUsings>enable</ImplicitUsings> @@ -51,15 +49,14 @@ </Exec> <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." /> <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." /> - <Exec WorkingDirectory="$(SpaRoot)" Command="$(SpaInstallCommand)" /> + <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> </Target> <!--/+:cnd:noEmit --> <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish"> <!-- As part of publishing, ensure the JS resources are freshly built in production mode --> - <SkipSpaBuild Condition="'$(DOTNET_RUNNING_IN_CONTAINER)' == 'true'">True</SkipSpaBuild> - <Exec WorkingDirectory="$(SpaRoot)" Command="$(SpaInstallCommand)" Condition="'$(SkipSpaBuild)' != 'True'" /> - <Exec WorkingDirectory="$(SpaRoot)" Command="$(SpaBuildCommand)" Condition="'$(SkipSpaBuild)' != 'True'" /> + <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" /> + <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" /> <!-- Include the newly-built files in the publish output --> <ItemGroup> |