Fixed issues with old .net version

module-1/README.md

@@ -35,7 +35,7 @@ Open the terminal in Visual Studio Code, located under **View > Terminal**
 Type the following `git` command to clone the necessary code to complete this tutorial:
 
 ```
-git clone https://github.com/aws-samples/aws-modern-application-workshop.git
+git clone https://github.com/iamtgray/aws-modern-application-workshop.git
 ```
 
 Make sure you are working on dotnet branch either on your favorite git client or using the following command:

module-2/README.md

@@ -152,11 +152,12 @@ In order to push container images into our new repository, we will need to obtai
 
 `Bash`
 ```
-$(aws ecr get-login --no-include-email)
+aws ecr get-login-password --region $(aws configure get region) | docker login --username AWS --password-stdin $(aws sts get-caller-identity --query Account --output text).dkr.ecr.$(aws configure get region).amazonaws.com
 ```
 `PowerShell`
 ```
-Invoke-Expression $(Get-ECRLoginCommand | Select-Object -ExpandProperty Command)
+(Get-ECRLoginCommand).Password | docker login --username AWS --password-stdin $(Get-STSCallerIdentity | Select-Object -ExpandProperty Account).dkr.ecr.region.amazonaws.com
+
 ```
 
 Next, push the image you created to the ECR repository using the copied tag from above. Using this command, docker will push your image and all the images it depends on to Amazon ECR:

module-2/aws-cli/code-pipeline.json

@@ -23,7 +23,7 @@
                 }
               ],
               "configuration": {
-                "BranchName": "master",
+                "BranchName": "main",
                 "RepositoryName": "MythicalMysfitsService-Repository"
               },
               "runOrder": 1

module-2/webapi/Controllers/MysfitsController.cs

@@ -9,7 +9,7 @@
 
 namespace ModernWebAppNET.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("api/mysfits")]
     [ApiController]
     public class MysfitsController : ControllerBase
     {
@@ -20,7 +20,14 @@ public IActionResult Get()
             using (StreamReader r = new StreamReader("./mysfits-response.json"))
             {
                 var json = r.ReadToEnd();
-                return new JsonResult(JObject.Parse(json));
+                var content = new ContentResult();
+
+                content.Content = json;
+                content.ContentType = "application/json";
+
+
+                return content;
+                //return new JsonResult(JObject.Parse(json)); 
             }
         }
 

module-2/webapi/Dockerfile

@@ -1,9 +1,11 @@
-FROM microsoft/dotnet:2.1-sdk as build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
 WORKDIR /app
 COPY . /app
-RUN dotnet publish -c Release -r linux-musl-x64 -o out
+RUN dotnet add package Newtonsoft.Json
+RUN dotnet publish -c Release -r linux-x64 -o out
 
-FROM microsoft/dotnet:2.1-runtime-deps-alpine
+
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
 WORKDIR /app
 COPY --from=build /app/out ./
 ENV ASPNETCORE_ENVIRONMENT=Production

module-2/webapi/ModernWebAppNET.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>

module-2/webapi/Startup.cs

@@ -29,11 +29,13 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
             services.AddCors();
+            services.AddControllers();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
+            app.UseRouting();
             app.UseCors(builder =>
                 builder
                     .AllowAnyOrigin()
@@ -50,7 +52,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             }
 
             app.UseHttpsRedirection();
-            app.UseMvc();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }

module-3/README.md

@@ -65,7 +65,7 @@ Also provided is a JSON file that can be used to batch insert a number of Mysfit
 
 `Bash`
 ```
-aws dynamodb batch-write-item --request-items file://~/environment/aws-modern-application-workshop/module-3/aws-cli/populate-dynamodb.json
+aws dynamodb batch-write-item --request-items file://module-3/aws-cli/populate-dynamodb.json
 ```
 `PowerShell`
 ```
@@ -133,6 +133,8 @@ Deploy your updated angular app by running the following PowerShell script or Ba
 ```
 ./module-3/deploy-frontend-scripts/Deploy-FrontEnd.ps1
 ```
+**Note:** If you have issues dimilar to `./node_modules/@angular/cli/bin/ng: No such file or directory` in your frontend deployment, go to the frontend directory and issue an `npm install` to locate dependencies
+
 **(Optional)**
 
 **Note:** If you used AWS Amplify to deploy your Angular app, use the following command to deploy your updated code:

module-3/webapi/Controllers/MysfitsController.cs

@@ -10,7 +10,7 @@
 
 namespace ModernWebAppNET.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("api/mysfits]")]
     [ApiController]
     public class MysfitsController : ControllerBase
     {

module-3/webapi/Dockerfile

@@ -1,9 +1,13 @@
-FROM microsoft/dotnet:2.1-sdk as build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
 WORKDIR /app
 COPY . /app
-RUN dotnet publish -c Release -r linux-musl-x64 -o out
+RUN dotnet add package Newtonsoft.Json
+RUN dotnet add package AWSSDK.DynamoDBv2
+RUN dotnet add package AWSSDK.Extensions.NETCore.Setup
+RUN dotnet publish -c Release -r linux-x64 -o out
 
-FROM microsoft/dotnet:2.1-runtime-deps-alpine
+
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
 WORKDIR /app
 COPY --from=build /app/out ./
 ENV ASPNETCORE_ENVIRONMENT=Production

module-3/webapi/ModernWebAppNET.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.12.2" />
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.6" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>

module-3/webapi/Startup.cs

@@ -42,6 +42,7 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
+            app.UseRouting();
             app.UseCors(builder =>
             builder
                 .AllowAnyOrigin()
@@ -53,7 +54,12 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseHttpsRedirection();
             app.UseMiddleware<ErrorHandlingMiddleware>();
-            app.UseMvc();
+
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }

module-4/README.md

@@ -132,7 +132,7 @@ cd ./module-4/frontend/src/aws-exports.js
 CTRL-F through the file to search for the various places `REPLACE_ME` is located and awaiting your specific parameters.  Once the edits have been made, save the file and execute the following AWS CLI command:
 
 ```
-aws apigateway import-rest-api --parameters endpointConfigurationTypes=REGIONAL --body file://~/environment/aws-modern-application-workshop/module-4/aws-cli/api-swagger.json --fail-on-warnings
+aws apigateway import-rest-api --parameters endpointConfigurationTypes=REGIONAL --body file://module-4/aws-cli/api-swagger.json --fail-on-warnings
 ```
 
 Copy the response this command returns and save the `id` value for the next step:

module-4/webapi/Controllers/MysfitsController.cs

@@ -12,7 +12,7 @@
 
 namespace ModernWebAppNET.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("api/mysfits")]
     [ApiController]
     public class MysfitsController : ControllerBase
     {

module-4/webapi/Dockerfile

@@ -1,9 +1,13 @@
-FROM microsoft/dotnet:2.1-sdk as build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
 WORKDIR /app
 COPY . /app
-RUN dotnet publish -c Release -r linux-musl-x64 -o out
+RUN dotnet add package Newtonsoft.Json
+RUN dotnet add package AWSSDK.DynamoDBv2
+RUN dotnet add package AWSSDK.Extensions.NETCore.Setup
+RUN dotnet publish -c Release -r linux-x64 -o out
 
-FROM microsoft/dotnet:2.1-runtime-deps-alpine
+
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
 WORKDIR /app
 COPY --from=build /app/out ./
 ENV ASPNETCORE_ENVIRONMENT=Production

module-4/webapi/ModernWebAppNET.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.12.2" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.6" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.4" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>

module-4/webapi/Startup.cs

@@ -45,6 +45,8 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
+            app.UseRouting();
+
             if (env.IsDevelopment())
             {
                 app.UseCors(builder =>
@@ -61,7 +63,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseHttpsRedirection();
             app.UseMiddleware<ErrorHandlingMiddleware>();
-            app.UseMvc();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }

module-5/webapi/Controllers/MysfitsController.cs

@@ -12,7 +12,7 @@
 
 namespace ModernWebAppNET.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("api/mysfits")]
     [ApiController]
     public class MysfitsController : ControllerBase
     {

module-5/webapi/Dockerfile

@@ -1,9 +1,13 @@
-FROM microsoft/dotnet:2.1-sdk as build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
 WORKDIR /app
 COPY . /app
-RUN dotnet publish -c Release -r linux-musl-x64 -o out
+RUN dotnet add package Newtonsoft.Json
+RUN dotnet add package AWSSDK.DynamoDBv2
+RUN dotnet add package AWSSDK.Extensions.NETCore.Setup
+RUN dotnet publish -c Release -r linux-x64 -o out
 
-FROM microsoft/dotnet:2.1-runtime-deps-alpine
+
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
 WORKDIR /app
 COPY --from=build /app/out ./
 ENV ASPNETCORE_ENVIRONMENT=Production

module-5/webapi/Startup.cs

@@ -45,6 +45,7 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
+            app.UseRouting();
             if (env.IsDevelopment())
             {
                 app.UseCors(builder =>
@@ -61,7 +62,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseHttpsRedirection();
             app.UseMiddleware<ErrorHandlingMiddleware>();
-            app.UseMvc();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
         }
     }
 }