From 072d9370322b99dd3baa8b47b85b0c8335b673ea Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Tue, 8 Aug 2023 12:16:17 +0530 Subject: [PATCH 1/7] Update config.yaml --- csharp/config.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/csharp/config.yaml b/csharp/config.yaml index 8447b524345..a3798d7a647 100644 --- a/csharp/config.yaml +++ b/csharp/config.yaml @@ -10,9 +10,6 @@ language: command: dotnet /usr/src/app/out/web.dll environment: ASPNETCORE_URLS: http://*:3000 - DOTNET_TieredPGO: 1 - DOTNET_TC_QuickJitForLoops: 1 - DOTNET_ReadyToRun: 0 framework: engines: From 75266ff57a57129848fc5784258faf5d80d25f94 Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Sun, 8 Oct 2023 15:40:38 +0000 Subject: [PATCH 2/7] refactor (dotnet) : Simplify project setup --- csharp/Directory.Build.props | 6 ++++++ csharp/aspnet-minimal-api/web.csproj | 4 ---- csharp/simplify.web/web.csproj | 4 ---- 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 csharp/Directory.Build.props diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props new file mode 100644 index 00000000000..5ba703e8bcf --- /dev/null +++ b/csharp/Directory.Build.props @@ -0,0 +1,6 @@ + + + net7.0 + enable + + \ No newline at end of file diff --git a/csharp/aspnet-minimal-api/web.csproj b/csharp/aspnet-minimal-api/web.csproj index 1af5701a607..646ad4e0018 100644 --- a/csharp/aspnet-minimal-api/web.csproj +++ b/csharp/aspnet-minimal-api/web.csproj @@ -1,6 +1,2 @@  - - net7.0 - enable - diff --git a/csharp/simplify.web/web.csproj b/csharp/simplify.web/web.csproj index c6b4978103c..90da0b10d09 100644 --- a/csharp/simplify.web/web.csproj +++ b/csharp/simplify.web/web.csproj @@ -1,8 +1,4 @@  - - net7.0 - enable - From 4e0a52297994e0a7a5dbe3b679596b1bcbdb0903 Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Sun, 8 Oct 2023 15:45:52 +0000 Subject: [PATCH 3/7] update docker file to include props --- csharp/Directory.Build.props | 2 +- csharp/Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props index 5ba703e8bcf..edd390d376c 100644 --- a/csharp/Directory.Build.props +++ b/csharp/Directory.Build.props @@ -2,5 +2,5 @@ net7.0 enable - + \ No newline at end of file diff --git a/csharp/Dockerfile b/csharp/Dockerfile index 23054e8964a..71103a964ad 100644 --- a/csharp/Dockerfile +++ b/csharp/Dockerfile @@ -4,6 +4,7 @@ WORKDIR /usr/src/app # copy csproj and restore as distinct layers COPY *.csproj . +COPY Directory.Build.props . RUN dotnet restore # copy everything else and build app From 8dc07109e3d7aafecc683a45d474cdf324ac4878 Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Sun, 8 Oct 2023 15:49:26 +0000 Subject: [PATCH 4/7] update oince again --- csharp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/Dockerfile b/csharp/Dockerfile index 71103a964ad..4fba0f21c71 100644 --- a/csharp/Dockerfile +++ b/csharp/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /usr/src/app # copy csproj and restore as distinct layers COPY *.csproj . -COPY Directory.Build.props . +COPY ["Directory.Build.props", "."] RUN dotnet restore # copy everything else and build app From 176a8c4bd9d0567450358aa19c97cd1c63fdbf54 Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Sun, 8 Oct 2023 15:53:51 +0000 Subject: [PATCH 5/7] correct the path --- csharp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/Dockerfile b/csharp/Dockerfile index 4fba0f21c71..1dc350a5598 100644 --- a/csharp/Dockerfile +++ b/csharp/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /usr/src/app # copy csproj and restore as distinct layers COPY *.csproj . -COPY ["Directory.Build.props", "."] +COPY ["../Directory.Build.props", "."] RUN dotnet restore # copy everything else and build app From 4cf8952d0f3e1fae6e098934f80962aaeb27dcee Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Sun, 8 Oct 2023 16:03:54 +0000 Subject: [PATCH 6/7] troubleshooting --- csharp/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/csharp/Dockerfile b/csharp/Dockerfile index 1dc350a5598..bd204304eac 100644 --- a/csharp/Dockerfile +++ b/csharp/Dockerfile @@ -4,6 +4,7 @@ WORKDIR /usr/src/app # copy csproj and restore as distinct layers COPY *.csproj . +RUN ls COPY ["../Directory.Build.props", "."] RUN dotnet restore From 6eeb22cd3952ba1f51c7471d8165e0a5bb0d08b7 Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Sun, 8 Oct 2023 16:07:12 +0000 Subject: [PATCH 7/7] trying again --- csharp/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/csharp/Dockerfile b/csharp/Dockerfile index bd204304eac..c6da9de219b 100644 --- a/csharp/Dockerfile +++ b/csharp/Dockerfile @@ -4,8 +4,7 @@ WORKDIR /usr/src/app # copy csproj and restore as distinct layers COPY *.csproj . -RUN ls -COPY ["../Directory.Build.props", "."] +COPY *.props . RUN dotnet restore # copy everything else and build app