Merge pull request #169 from rvrane-aws/master

Update RecommendationBatchUpdater for .NET 10.0 framework support

Author: cslong

.github/workflows/dotnet-core.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Check for secrets leak on the repo
       run: |
           git clone https://github.com/awslabs/git-secrets.git target
@@ -23,14 +23,10 @@ jobs:
           echo "Added aws secret templates"
           git secrets --scan -r ../
           echo "Repository scan completed"
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.301
-    - name: Setup .NET Core 5
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.301
+        dotnet-version: '8.0.x'
     - name: Install dependencies
       run: dotnet restore RecommendationTools/RecommendationValidator/RecommendationValidator.csproj
     - name: Validate

NuGet.Config

@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="dotnet" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <!-- <add key="dotnet" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" /> -->
     <add key="encore-nuget" value="https://s3-us-west-2.amazonaws.com/aws.portingassistant.dotnet.download/nuget/index.json" />
   </packageSources>
 </configuration>

RecommendationTools/RecommendationBatchUpdater/Program.cs

@@ -17,8 +17,8 @@ static void Main(string[] args)
                         // NOTE: We need to verify compatibility of packages added by rules with //
                         //       the target framework being added.                               //
                         ///////////////////////////////////////////////////////////////////////////
-                        const string PreviousDotnetVersion = "net8.0";
-                        const string NextDotnetVersion = "net9.0";
+                        const string PreviousDotnetVersion = "net9.0";
+                        const string NextDotnetVersion = "net10.0";
 
                         var recommendations = Loader.LoadBatchRecommendations(o.Directory);
                         Updater.BatchAddFramework(recommendations, NextDotnetVersion, PreviousDotnetVersion);

RecommendationTools/RecommendationBatchUpdater/RecommendationBatchUpdater.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

RecommendationTools/RecommendationValidator/RecommendationValidator.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

recommendation/antlr.runtime.json

@@ -71,6 +71,15 @@
                 "ARM32",
                 "ARM64"
               ]
+            },
+            {
+              "Name": "net10.0",
+              "TargetCPU": [
+                "x86",
+                "x64",
+                "ARM32",
+                "ARM64"
+              ]
             }
           ],
           "Description": "Add a reference to Antlr3.Runtime",

recommendation/antlr.runtime.misc.json

@@ -71,6 +71,15 @@
                 "ARM32",
                 "ARM64"
               ]
+            },
+            {
+              "Name": "net10.0",
+              "TargetCPU": [
+                "x86",
+                "x64",
+                "ARM32",
+                "ARM64"
+              ]
             }
           ],
           "Description": "Add reference to Antlr3.Runtime",

recommendation/antlr.runtime.tree.json

@@ -71,6 +71,15 @@
                 "ARM32",
                 "ARM64"
               ]
+            },
+            {
+              "Name": "net10.0",
+              "TargetCPU": [
+                "x86",
+                "x64",
+                "ARM32",
+                "ARM64"
+              ]
             }
           ],
           "Description": "Add a reference to Antlr3.Runtime",

recommendation/corewcf.channels.json

@@ -71,6 +71,15 @@
                 "ARM32",
                 "ARM64"
               ]
+            },
+            {
+              "Name": "net10.0",
+              "TargetCPU": [
+                "x86",
+                "x64",
+                "ARM32",
+                "ARM64"
+              ]
             }
           ],
           "Description": "Replace System.ServiceModel.Channels with CoreWCF.Channels Namespace. Check CoreWCF Compatibility at https://github.com/CoreWCF/CoreWCF/releases",

recommendation/corewcf.codebased.project.json

@@ -70,6 +70,15 @@
                 "ARM32",
                 "ARM64"
               ]
+            },
+            {
+              "Name": "net10.0",
+              "TargetCPU": [
+                "x86",
+                "x64",
+                "ARM32",
+                "ARM64"
+              ]
             }
           ],
           "Description": "",