Use .NET 6 SDK (#126)

Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Dec 19, 2022 · da0f0ac · da0f0ac
1 parent 24aa948
commit da0f0ac
Show file tree

Hide file tree

Showing 43 changed files with 717 additions and 488 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -10,7 +10,9 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.405'
+        dotnet-version: |
+          5.0.x
+          6.0.x
     - uses: actions/cache@v2
       with:
         path: ~/.nuget/packages

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -42,7 +42,9 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '5.0.405'
+          dotnet-version: |
+            5.0.x
+            6.0.x
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,9 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.405'
+        dotnet-version: |
+          5.0.x
+          6.0.x
     - uses: actions/cache@v2
       with:
         path: ~/.nuget/packages

diff --git a/.github/workflows/test-jobs.yml b/.github/workflows/test-jobs.yml
@@ -26,7 +26,9 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '5.0.405'
+          dotnet-version: |
+            5.0.x
+            6.0.x
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages
@@ -66,7 +68,9 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '5.0.405'
+          dotnet-version: |
+            5.0.x
+            6.0.x
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added `dependabot_changelog` workflow ([#118](https://github.com/opensearch-project/opensearch-net/pull/118))
 
 ### Changed
+- Updated SDK to .NET 6 ([#126](https://github.com/opensearch-project/opensearch-net/pull/126))
 
 ### Deprecated
 

diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/packages.lock.json b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/packages.lock.json
@@ -147,18 +147,18 @@
       "opensearch.opensearch.managed": {
         "type": "Project",
         "dependencies": {
-          "OpenSearch.Stack.ArtifactsApi": "1.1.0",
-          "Proc": "0.6.1",
-          "System.Net.Http": "4.3.4"
+          "OpenSearch.Stack.ArtifactsApi": "[1.2.1, )",
+          "Proc": "[0.6.1, )",
+          "System.Net.Http": "[4.3.4, )"
         }
       },
       "opensearch.stack.artifactsapi": {
         "type": "Project",
         "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
+          "SemanticVersioning": "[0.8.0, )",
+          "System.Net.Http": "[4.3.4, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )",
+          "System.Text.Json": "[6.0.5, )"
         }
       }
     },
@@ -167,7 +167,10 @@
         "type": "Direct",
         "requested": "[1.0.0-preview.2, )",
         "resolved": "1.0.0-preview.2",
-        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
+        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2"
+        }
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -205,6 +208,11 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.0-preview.2",
+        "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg=="
+      },
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -930,18 +938,18 @@
       "opensearch.opensearch.managed": {
         "type": "Project",
         "dependencies": {
-          "OpenSearch.Stack.ArtifactsApi": "1.1.0",
-          "Proc": "0.6.1",
-          "System.Net.Http": "4.3.4"
+          "OpenSearch.Stack.ArtifactsApi": "[1.2.1, )",
+          "Proc": "[0.6.1, )",
+          "System.Net.Http": "[4.3.4, )"
         }
       },
       "opensearch.stack.artifactsapi": {
         "type": "Project",
         "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
+          "SemanticVersioning": "[0.8.0, )",
+          "System.Net.Http": "[4.3.4, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )",
+          "System.Text.Json": "[6.0.5, )"
         }
       }
     }

diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/packages.lock.json b/abstractions/src/OpenSearch.OpenSearch.Managed/packages.lock.json
@@ -142,10 +142,10 @@
       "opensearch.stack.artifactsapi": {
         "type": "Project",
         "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
+          "SemanticVersioning": "[0.8.0, )",
+          "System.Net.Http": "[4.3.4, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )",
+          "System.Text.Json": "[6.0.5, )"
         }
       }
     },
@@ -154,7 +154,10 @@
         "type": "Direct",
         "requested": "[1.0.0-preview.2, )",
         "resolved": "1.0.0-preview.2",
-        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
+        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2"
+        }
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -227,6 +230,11 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.0-preview.2",
+        "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg=="
+      },
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -910,10 +918,10 @@
       "opensearch.stack.artifactsapi": {
         "type": "Project",
         "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
+          "SemanticVersioning": "[0.8.0, )",
+          "System.Net.Http": "[4.3.4, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )",
+          "System.Text.Json": "[6.0.5, )"
         }
       }
     }

diff --git a/abstractions/src/OpenSearch.OpenSearch.Xunit/packages.lock.json b/abstractions/src/OpenSearch.OpenSearch.Xunit/packages.lock.json
@@ -196,26 +196,26 @@
       "opensearch.opensearch.ephemeral": {
         "type": "Project",
         "dependencies": {
-          "OpenSearch.OpenSearch.Managed": "1.1.0",
-          "SharpZipLib.NETStandard": "1.0.7",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0"
+          "OpenSearch.OpenSearch.Managed": "[1.2.1, )",
+          "SharpZipLib.NETStandard": "[1.0.7, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )"
         }
       },
       "opensearch.opensearch.managed": {
         "type": "Project",
         "dependencies": {
-          "OpenSearch.Stack.ArtifactsApi": "1.1.0",
-          "Proc": "0.6.1",
-          "System.Net.Http": "4.3.4"
+          "OpenSearch.Stack.ArtifactsApi": "[1.2.1, )",
+          "Proc": "[0.6.1, )",
+          "System.Net.Http": "[4.3.4, )"
         }
       },
       "opensearch.stack.artifactsapi": {
         "type": "Project",
         "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
+          "SemanticVersioning": "[0.8.0, )",
+          "System.Net.Http": "[4.3.4, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )",
+          "System.Text.Json": "[6.0.5, )"
         }
       }
     },
@@ -224,7 +224,10 @@
         "type": "Direct",
         "requested": "[1.0.0-preview.2, )",
         "resolved": "1.0.0-preview.2",
-        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
+        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2"
+        }
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -264,6 +267,11 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.0-preview.2",
+        "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg=="
+      },
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1042,25 +1050,25 @@
       "opensearch.opensearch.ephemeral": {
         "type": "Project",
         "dependencies": {
-          "OpenSearch.OpenSearch.Managed": "1.1.0",
-          "SharpZipLib.NETStandard": "1.0.7"
+          "OpenSearch.OpenSearch.Managed": "[1.2.1, )",
+          "SharpZipLib.NETStandard": "[1.0.7, )"
         }
       },
       "opensearch.opensearch.managed": {
         "type": "Project",
         "dependencies": {
-          "OpenSearch.Stack.ArtifactsApi": "1.1.0",
-          "Proc": "0.6.1",
-          "System.Net.Http": "4.3.4"
+          "OpenSearch.Stack.ArtifactsApi": "[1.2.1, )",
+          "Proc": "[0.6.1, )",
+          "System.Net.Http": "[4.3.4, )"
         }
       },
       "opensearch.stack.artifactsapi": {
         "type": "Project",
         "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
+          "SemanticVersioning": "[0.8.0, )",
+          "System.Net.Http": "[4.3.4, )",
+          "System.Runtime.InteropServices.RuntimeInformation": "[4.3.0, )",
+          "System.Text.Json": "[6.0.5, )"
         }
       }
     }

diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/packages.lock.json b/abstractions/src/OpenSearch.Stack.ArtifactsApi/packages.lock.json
@@ -142,7 +142,10 @@
         "type": "Direct",
         "requested": "[1.0.0-preview.2, )",
         "resolved": "1.0.0-preview.2",
-        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
+        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2"
+        }
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -244,6 +247,11 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.0-preview.2",
+        "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg=="
+      },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
         "resolved": "4.3.2",

diff --git a/...ns/tests/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj b/...ns/tests/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <IsPackable>false</IsPackable>
   </PropertyGroup>