Merge pull request #1040 from SMI/net6

updated global.json to 6.0.102
SMI · Feb 10, 2022 · b0953a1 · b0953a1
2 parents 38b900d + e8e53b0
commit b0953a1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 32 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,7 @@
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <Platforms>x64</Platforms>
     <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <!-- Many build warnings for missing docstrings when enabling this - we may want to fix and enable per-project where needed instead? -->

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.302",
+    "version": "6.0.102",
     "rollForward": "minor"
   }
 }
diff --git a/news/1040-feature.md b/news/1040-feature.md
@@ -0,0 +1 @@
+Updated to latest dotnet sdk (net6)
diff --git a/src/common/Smi.Common/Helpers/IEnumerableExtensions.cs b/src/common/Smi.Common/Helpers/IEnumerableExtensions.cs
diff --git a/utils/runDotnetTests.py b/utils/runDotnetTests.py
@@ -73,8 +73,8 @@ def main() -> int:
     cmd = _windows_bash_fixup(args.platform, cmd)
     _run(cmd)
 
-    net5_glob = {Path(x) for x in glob.glob("**/net5", recursive=True)}
-    for build_dir in net5_glob:
+    net6_glob = {Path(x) for x in glob.glob("**/net6", recursive=True)}
+    for build_dir in net6_glob:
         try:
             os.symlink(
                 Path("data/microserviceConfigs/default.yaml").resolve(),