Add .NET 9 target for testing

IronLanguages · Jun 25, 2024 · 332ed8d · 332ed8d
1 parent 1972d82
commit 332ed8d
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,6 +26,11 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '8.0.x'
+    - name: Setup .NET 9.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '9.0.x'
+        include-prerelease: true
     - name: Build
       run: pwsh make.ps1
     - name: Package
@@ -46,3 +51,6 @@ jobs:
     - name: Test (net8.0)
       run: ./make.ps1 -frameworks net8.0 test-all
       shell: pwsh
+    - name: Test (net9.0)
+      run: ./make.ps1 -frameworks net9.0 test-all
+      shell: pwsh
diff --git a/Build.proj b/Build.proj
@@ -108,7 +108,7 @@
           Outputs="$(PackageDir)\DynamicLanguageRuntime.$(PackageVersion).zip">
     <ItemGroup>
       <ZipFiles Include="$(StageDir)\**\*.dll;$(StageDir)\**\*.xml;$(StageDir)\README.md;$(StageDir)\LICENSE"
-                Exclude="$(StageDir)\netcoreapp3.1\*;$(StageDir)\net7.0*\*;$(StageDir)\net8.0*\*;$(StageDir)\net9.0*\*" />
+                Exclude="$(StageDir)\netcoreapp3.1\*;$(StageDir)\net7.0*\*;$(StageDir)\net9.0*\*" />
     </ItemGroup>
     <Message Text="$(ZipFiles)" />
     <Zip Files="@(ZipFiles)" ZipFileName="$(PackageDir)\DynamicLanguageRuntime.$(PackageVersion).zip" WorkingDirectory="$(StageDir)"/>

diff --git a/Build/steps.yml b/Build/steps.yml
@@ -38,6 +38,12 @@ steps:
     inputs:
       packageType: 'sdk'
       version: '8.0.x'
+
+  - task: UseDotNet@2
+    displayName: Install .NET 9.0 SDK for build
+    inputs:
+      packageType: 'sdk'
+      version: '9.0.x'
       includePreviewVersions: true
 
   # Set Mono version on macOS

diff --git a/Dlr.sln b/Dlr.sln
@@ -38,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{60056F49
 		Build\net462.props = Build\net462.props
 		Build\net6.0.props = Build\net6.0.props
 		Build\net8.0.props = Build\net8.0.props
+		Build\net9.0.props = Build\net9.0.props
 		Build\netstandard2.0.props = Build\netstandard2.0.props
 		Build\steps.yml = Build\steps.yml
 	EndProjectSection

diff --git a/Package/nuget/DynamicLanguageRuntime.nuspec b/Package/nuget/DynamicLanguageRuntime.nuspec
@@ -32,9 +32,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="**\*.dll" target="lib" exclude="netcoreapp3.1\*;net7.0*\*;net8.0*\*" />
-    <file src="**\*.pdb" target="lib" exclude="netcoreapp3.1\*;net7.0*\*;net8.0*\*" />
-    <file src="**\*.xml" target="lib" exclude="netcoreapp3.1\*;net7.0*\*;net8.0*\*" />
+    <file src="**\*.dll" target="lib" exclude="netcoreapp3.1\*;net7.0*\*;net9.0*\*" />
+    <file src="**\*.pdb" target="lib" exclude="netcoreapp3.1\*;net7.0*\*;net9.0*\*" />
+    <file src="**\*.xml" target="lib" exclude="netcoreapp3.1\*;net7.0*\*;net9.0*\*" />
     <file src="README.md;LICENSE" />
   </files>
 </package>
diff --git a/Src/Microsoft.Dynamic/Hosting/Shell/ConsoleHostOptionsParser.cs b/Src/Microsoft.Dynamic/Hosting/Shell/ConsoleHostOptionsParser.cs
@@ -99,7 +99,7 @@ public void Parse(string[] args) {
         private void ParseOption(string arg, out string name, out string value) {
             Debug.Assert(arg != null);
 
-            int colon = arg.IndexOf(':');
+            int colon = arg.IndexOf(':', StringComparison.Ordinal);
 
             if (colon >= 0) {
                 name = arg.Substring(0, colon);

diff --git a/Src/Microsoft.Dynamic/StringExtensions.cs b/Src/Microsoft.Dynamic/StringExtensions.cs
@@ -14,6 +14,11 @@ public static bool StartsWith(this string str, char value)
         {
             return str.StartsWith(value.ToString(), StringComparison.Ordinal);
         }
+
+        public static int IndexOf(this string str, char value, StringComparison comparisonType) {
+            if (comparisonType == StringComparison.Ordinal) return str.IndexOf(value);
+            return str.IndexOf(value.ToString(), comparisonType);
+        }
 #endif
     }
 }
diff --git a/Tests/Metadata/Metadata.csproj b/Tests/Metadata/Metadata.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0</TargetFrameworks>
     <!-- EOL netcoreapp3.1 is used to test netstandard2.0 assemblies -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <OutputType>Exe</OutputType>

diff --git a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0</TargetFrameworks>
     <!-- EOL netcoreapp3.1 is used to test netstandard2.0 assemblies -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>

diff --git a/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0</TargetFrameworks>
     <!-- EOL netcoreapp3.1 is used to test netstandard2.0 assemblies -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>

diff --git a/make.ps1 b/make.ps1
@@ -4,7 +4,7 @@ Param(
     [Parameter(Position=1)]
     [String] $target = "release",
     [String] $configuration = "Release",
-    [String[]] $frameworks=@('net462','netcoreapp3.1','net6.0','net8.0'),
+    [String[]] $frameworks=@('net462','netcoreapp3.1','net6.0','net8.0','net9.0'),
     [String] $platform = "x64",
     [switch] $runIgnored
 )