Merge pull request #23 from Ignition-Group-Open-Source-Contrib/keyur/…

…UpgradeDaprMicroserviceToNet7 upgraded DaprMicroserviceTemplate to .net7
Ignition-Group-Open-Source-Contrib · Sep 15, 2023 · 25128cc · 25128cc
2 parents f7985da + fd14fc1
commit 25128cc
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 35 deletions.
diff --git a/DaprMicroserviceTemplate/DaprMicroServiceTemplate.csproj b/DaprMicroserviceTemplate/DaprMicroServiceTemplate.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <UserSecretsId>4aad6f63-aaf7-4e27-aa16-31c07600f4a8</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,10 +27,11 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Gelf4Net.UdpAppender" Version="1.0.0.18" />
-    <PackageReference Include="log4net" Version="2.0.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
+    <PackageReference Include="Gelf4Net.UdpAppender" Version="1.0.0.22" />
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     <PackageReference Include="AutoWrapper.Core" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/DaprMicroserviceTemplate/Dockerfile b/DaprMicroserviceTemplate/Dockerfile
@@ -1,10 +1,10 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-bookworm-slim AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build
 WORKDIR /src
 COPY *.csproj ./
 COPY *.Config ./

diff --git a/DaprMicroserviceTemplate/Readme.md b/DaprMicroserviceTemplate/Readme.md
@@ -2,7 +2,7 @@
 The sample shows how to create a .Net API,integrate with Dapr and invoke its endpoints on the client application. 
 
 ## Prerequistes
-* [.Net Core SDK 3.1](https://dotnet.microsoft.com/download)
+* [.Net Core SDK 7.0](https://dotnet.microsoft.com/download)
 * [Dapr CLI](https://github.com/dapr/cli)
 * [Dapr DotNet SDK](https://github.com/dapr/dotnet-sdk)
 

diff --git a/DaprMicroserviceTemplate/T4Include/deploy.ttinclude b/DaprMicroserviceTemplate/T4Include/deploy.ttinclude
@@ -120,6 +120,13 @@ spec:
       containers:
       - name: <#= props["service"] #>app
         image: adlacrdev.azurecr.io/<#= props["service"] #>:latest
+        resources:
+          requests:
+            memory: "90Mi"
+            cpu: "0.01"
+          limits:
+            memory: "100Mi"
+            cpu: "0.1"
         ports:
         - containerPort: 3000
         imagePullPolicy: Always
@@ -159,6 +166,13 @@ spec:
       containers:
       - name: <#= props["service"] #>app
         image: adlacrdev.azurecr.io/<#= props["service"] #>:$(tag)
+        resources:
+          requests:
+            memory: "90Mi"
+            cpu: "0.01"
+          limits:
+            memory: "100Mi"
+            cpu: "0.1"
         ports:
         - containerPort: 3000
         imagePullPolicy: Always

diff --git a/DaprMicroserviceTemplate/T4Include/log4net.ttinclude b/DaprMicroserviceTemplate/T4Include/log4net.ttinclude
@@ -52,33 +52,33 @@ fileTemplateManager.StartNewFile("log4net.Production.config");
   # THIS FILE IS AUTOGENERATED BY A TOOL
   # IF YOU EDIT IT ANY CHANGES YOU MAKE WILL BE LOST
 
-  <?xml version="1.0" encoding="utf-8" ?>
-  <log4net>
-    <!-- A1 is set to be a ConsoleAppender -->
-    <appender name="A1" type="log4net.Appender.ConsoleAppender">
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+  <!-- A1 is set to be a ConsoleAppender -->
+  <appender name="A1" type="log4net.Appender.ConsoleAppender">
 
-      <!-- A1 uses PatternLayout -->
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%-4timestamp [%thread] %-5level %logger %ndc - %message%newline" />
-      </layout>
-    </appender>
+    <!-- A1 uses PatternLayout -->
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="%-4timestamp [%thread] %-5level %logger %ndc - %message%newline" />
+    </layout>
+  </appender>
 
-    <appender name="GelfUdpAppender" type="Gelf4Net.Appender.GelfUdpAppender, Gelf4Net.UdpAppender">
+  <appender name="GelfUdpAppender" type="Gelf4Net.Appender.GelfUdpAppender, Gelf4Net.UdpAppender">
 
-      <remoteAddress value="graylog.webuildgreatsoftware.co.za" />
+    <remoteAddress value="graylog.webuildgreatsoftware.co.za" />
 
-      <remotePort value="12202" />
-      <layout type="Gelf4Net.Layout.GelfLayout, Gelf4Net.UdpAppender">
-        <param name="AdditionalFields" value="app:GelfUdpAppender,version:1.0,Environment:Production,Level:%level,Service:"<#= props["service"] #>" />
-        <param name="Facility" value="RandomPhrases" />
-        <param name="IncludeLocationInformation" value="true" />
-      </layout>
-    </appender>
+    <remotePort value="12202" />
+    <layout type="Gelf4Net.Layout.GelfLayout, Gelf4Net.UdpAppender">
+      <param name="AdditionalFields" value="app:GelfUdpAppender,version:1.0,Environment:Production,Level:%level,Service:"<#= props["service"] #>" />
+      <param name="Facility" value="RandomPhrases" />
+      <param name="IncludeLocationInformation" value="true" />
+    </layout>
+  </appender>
 
-    <!-- Set root logger level to DEBUG and its only appender to A1 -->
-    <root>
-      <level value="ALL" />
-      <appender-ref ref="A1" />
-      <appender-ref ref="GelfUdpAppender" />
-    </root>
-  </log4net>
+  <!-- Set root logger level to DEBUG and its only appender to A1 -->
+  <root>
+    <level value="ALL" />
+    <appender-ref ref="A1" />
+    <appender-ref ref="GelfUdpAppender" />
+  </root>
+</log4net>
diff --git a/DaprMicroserviceTemplate/T4Include/log4net2.ttinclude b/DaprMicroserviceTemplate/T4Include/log4net2.ttinclude
@@ -45,7 +45,7 @@ fileTemplateManager.StartNewFile("log4net.Development.config");
 <#
 fileTemplateManager.StartNewFile("log4net.Production.config");
  #>
-  <?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <log4net>
   <!-- A1 is set to be a ConsoleAppender -->
   <appender name="A1" type="log4net.Appender.ConsoleAppender">

diff --git a/MicroserviceTemplateInstallerVS2022/ProjectTemplates/DaprMicroserviceTemplate.zip b/MicroserviceTemplateInstallerVS2022/ProjectTemplates/DaprMicroserviceTemplate.zip
diff --git a/MicroserviceTemplateInstallerVS2022/source.extension.vsixmanifest b/MicroserviceTemplateInstallerVS2022/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="MicroserviceTemplateInstallerVS2022.b2499705-d784-411b-8f50-beac80ca9b22" Version="1.1" Language="en-US" Publisher="Ignition group" />
+        <Identity Id="MicroserviceTemplateInstallerVS2022.b2499705-d784-411b-8f50-beac80ca9b22" Version="1.2" Language="en-US" Publisher="Ignition group" />
         <DisplayName>Dapr Microservice Template</DisplayName>
         <Description xml:space="preserve">A Microservice Template using Dapr.io and Kubernetes - VS2022 </Description>
         <MoreInfo>https://github.com/Ignition-Group-Open-Source-Contrib/Dapr-Microservice-Template</MoreInfo>