Net8 tests

.vsts-dotnet-ci.yml

@@ -52,20 +52,20 @@ jobs:
 - template: /build/ci/job-template.yml
   parameters:
     architecture: arm
-    name: Ubuntu_x64_cross_arm_Net60
+    name: Ubuntu_x64_cross_arm
     buildScript: ./build.sh
     container: UbuntuCrossArmContainer
     customMatrixes:
       Debug_Build:
         _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
-        _targetFramework: net6.0
+        _targetFramework: net8.0
       Release_Build:
         _configuration: Release
         _config_short: RI
         _includeBenchmarkData: true
-        _targetFramework: net6.0
+        _targetFramework: net8.0
     innerLoop: true
     pool:
       name: NetCore-Public
@@ -75,20 +75,20 @@ jobs:
 - template: /build/ci/job-template.yml
   parameters:
     architecture: arm64
-    name: Ubuntu_x64_cross_arm64_Net60
+    name: Ubuntu_x64_cross_arm64
     buildScript: ./build.sh
     container: UbuntuCrossArm64Container
     customMatrixes:
       Debug_Build:
         _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
-        _targetFramework: net6.0
+        _targetFramework: net8.0
       Release_Build:
         _configuration: Release
         _config_short: RI
         _includeBenchmarkData: true
-        _targetFramework: net6.0
+        _targetFramework: net8.0
     innerLoop: true
     pool:
       name: NetCore-Public
@@ -97,7 +97,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Centos_x64_Net60
+    name: Centos_x64
     buildScript: ./build.sh
     container: CentosContainer
     innerLoop: true
@@ -108,7 +108,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Ubuntu_x64_Net60
+    name: Ubuntu_x64
     buildScript: ./build.sh
     container: UbuntuContainer
     innerLoop: true
@@ -119,7 +119,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: MacOS_x64_Net60
+    name: MacOS_x64
     buildScript: ./build.sh
     innerLoop: true
     pool:
@@ -129,19 +129,19 @@ jobs:
 - template: /build/ci/job-template.yml
   parameters:
     architecture: arm64
-    name: MacOS_cross_arm64_Net6
+    name: MacOS_cross_arm64
     buildScript: ./build.sh
     customMatrixes:
       Debug_Build:
         _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
-        _targetFramework: net6.0
+        _targetFramework: net8.0
       Release_Build:
         _configuration: Release
         _config_short: RI
         _includeBenchmarkData: true
-        _targetFramework: net6.0
+        _targetFramework: net8.0
     innerLoop: true
     pool:
       vmImage: macOS-13
@@ -150,19 +150,19 @@ jobs:
 - template: /build/ci/job-template.yml
   parameters:
     architecture: arm64
-    name: Windows_cross_arm64_Net6
+    name: Windows_cross_arm64
     buildScript: build.cmd
     customMatrixes:
       Debug_Build:
         _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
-        _targetFramework:  net6.0
+        _targetFramework:  net8.0
       Release_Build:
         _configuration: Release
         _config_short: RI
         _includeBenchmarkData: false
-        _targetFramework:  net6.0
+        _targetFramework:  net8.0
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v6.0"
     pool:
@@ -172,7 +172,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Windows_x64_Net6
+    name: Windows_x64
     buildScript: build.cmd
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
@@ -205,7 +205,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Windows_x86_Net6
+    name: Windows_x86
     architecture: x86
     buildScript: build.cmd
     innerLoop: true

build/Codecoverage.proj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- We need to specify a framework in order for the Restore target to work -->
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

build/ci/job-template.yml

@@ -51,12 +51,12 @@ jobs:
             _configuration: Debug
             _config_short: D
             _includeBenchmarkData: false
-            _targetFramework: net6.0
+            _targetFramework: net8.0
           Release_Build:
             _configuration: Release
             _config_short: R
             _includeBenchmarkData: true
-            _targetFramework: net6.0
+            _targetFramework: net8.0
         ${{ if ne(parameters.customMatrixes, '') }}:
           ${{ insert }}: ${{ parameters.customMatrixes }}
 
@@ -76,7 +76,7 @@ jobs:
     - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
       - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
         displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path
-    - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=True $(hardLink)
+    - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=True $(hardLink)
       displayName: Build
     - ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}:
       - task: Bash@3
@@ -116,15 +116,15 @@ jobs:
           displayName: Clean up useless project
       - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
         displayName: Build Nightly-Build Project with latest package versions
-      - script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} $(testTargetFramework)
+      - script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
         displayName: Run Nightly Build Tests
     - ${{ if eq(parameters.nightlyBuild, 'false') }}:
       - ${{ if eq(parameters.innerLoop, 'false') }}:
         - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: set PATH=%PATH%;%USERPROFILE%\.nuget\packages\libtorch-cpu-win-x64\2.2.1.1\runtimes\win-x64\native;%USERPROFILE%\.nuget\packages\torchsharp\0.102.7\runtimes\win-x64\native & ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
+          - script: set PATH=%PATH%;%USERPROFILE%\.nuget\packages\libtorch-cpu-win-x64\2.2.1.1\runtimes\win-x64\native;%USERPROFILE%\.nuget\packages\torchsharp\0.102.7\runtimes\win-x64\native & ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} -test -integrationTest /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
             displayName: Run All Tests.
         - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
-          - script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
+          - script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
             displayName: Run Specific Tests.
         - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
           - task: VSTest@2
@@ -149,7 +149,7 @@ jobs:
               publishRunAttachments: true
       - ${{ if eq(parameters.innerLoop, 'true') }}:
         - ${{ if eq(parameters.codeCoverage, True) }}:
-          - script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
+          - script: ${{ parameters.buildScript }} /p:Build=false -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} -test -integrationTest /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework)
             displayName: Run CI Tests.
         - ${{ if eq(parameters.codeCoverage, False) }}:
           - template: /build/ci/send-to-helix.yml
@@ -236,5 +236,5 @@ jobs:
           script: Get-ChildItem -Path  '.\artifacts\bin' -Recurse | Where-Object {$_.FullName -like "*runtimes*"} | Remove-Item -Recurse -Confirm:$false -Force
         displayName: Clean up runtime folder for package (Unix)
     - ${{ if eq(parameters.nightlyBuild, 'false') }}:
-      - script: ${{ parameters.buildScript }} /p:Build=false -pack -ci -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} $(testTargetFramework)
+      - script: ${{ parameters.buildScript }} /p:Build=false -pack -ci -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
         displayName: Build Packages

build/ci/send-to-helix.yml

@@ -20,6 +20,31 @@ parameters:
   condition: succeeded()                 # optional -- condition for step to execute; defaults to succeeded()
 
 steps:
+  - script: ${{ parameters.MsBuildScript}}
+            $(Build.SourcesDirectory)/eng/helix.proj
+            /t:Restore
+            /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
+            /p:Configuration=${{ parameters.Configuration }}
+            /p:TargetArchitecture=${{ parameters.Architecture }}
+            /p:BuildConfig=${{ parameters.Configuration }}
+            /p:BuildArchitecture=${{ parameters.Architecture }}
+            /p:HelixSource=${{ parameters.HelixSource }}
+            /p:HelixType=${{ parameters.HelixType }}
+            /p:HelixBuild=${{ parameters.HelixBuild }}
+            /p:HelixConfiguration="${{ parameters.HelixConfiguration }}"
+            /p:HelixAccessToken="${{ parameters.HelixAccessToken }}"
+            /p:EnableXUnitReporter=${{ parameters.EnableXUnitReporter }}
+            /p:WaitForWorkItemCompletion=${{ parameters.WaitForWorkItemCompletion }}
+            /p:HelixBaseUri=${{ parameters.HelixBaseUri }}
+            ${{ parameters.WarnAsError }}
+            ${{ parameters.TestTargetFramework }}
+    displayName: "Helix Restore"
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      Creator: ${{ parameters.Creator }}
+      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
+    continueOnError: ${{ parameters.continueOnError }}
+
   - script: ${{ parameters.MsBuildScript}}
             $(Build.SourcesDirectory)/eng/helix.proj
             /t:Test

build/codecoverage-ci.yml

@@ -44,7 +44,7 @@ jobs:
         _configuration: Debug
         _config_short: D
         _includeBenchmarkData: false
-        _targetFramework: net6.0
+        _targetFramework: net8.0
     codeCoverage: true
     pool:
       name: NetCore-Public

docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <NoWarn>$(NoWarn)</NoWarn>
 

docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <SignAssembly>false</SignAssembly>
     <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->

docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
     <PublicSign>false</PublicSign>
   </PropertyGroup>

docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <SignAssembly>false</SignAssembly>
     <!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->

eng/Versions.props

@@ -91,6 +91,7 @@
     <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
     <FluentAssertionVersion>6.12.0</FluentAssertionVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
     <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24504.4</MicrosoftDotNetXUnitExtensionsVersion>

eng/helix.proj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk" InitialTargets="CreateHelixWorkItems">
+<Project Sdk="Microsoft.DotNet.Helix.Sdk">
   <Choose>
     <When Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('windows'))">
     <PropertyGroup>
@@ -39,10 +39,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalDotNetPackage Include="$(DotNetRuntime60Version)">
+    <AdditionalDotNetPackage Include="$(DotNetRuntime80Version)">
       <PackageType>runtime</PackageType>
       <DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'x86'">win-x86</DotNetCliRuntime>
       <DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'arm' And $(HelixTargetQueues.ToLowerInvariant().Contains('ubuntu'))">linux-arm</DotNetCliRuntime>
+      <DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'arm64' And $(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">osx-arm64</DotNetCliRuntime>
     </AdditionalDotNetPackage>
   </ItemGroup>
 
@@ -89,7 +90,11 @@
     </HelixCorrelationPayload>
   </ItemGroup>
 
-  <Target Name="CreateHelixWorkItems">
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="CreateHelixWorkItems" BeforeTargets="BeforeTest">
     <MSBuild Projects="@(MyProjects)"
       Targets="GetTargetFrameworks"
       BuildInParallel="$(BuildInParallel)"
@@ -111,6 +116,13 @@
       <HelixCorrelationPayloadPath Condition="$(IsPosixShell)">$HELIX_CORRELATION_PAYLOAD</HelixCorrelationPayloadPath>
       <HelixCorrelationPayloadPath Condition="!$(IsPosixShell)">%HELIX_CORRELATION_PAYLOAD%</HelixCorrelationPayloadPath>
 
+      <RunTestScript Condition="'$(OS)' != 'Windows_NT'">runTests.sh</RunTestScript>
+      <RunTestScript Condition="'$(OS)' == 'Windows_NT'">./runTests.cmd</RunTestScript>
+
+      <RunCommand>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</RunCommand>
+      <RunCommand Condition="$(TestTargetFramework.EndsWith('net462')) And %(ProjectsWithTargetFramework.TargetFrameworks) != 'net8.0'">$(HelixCorrelationPayloadPath)/xunit-runner/tools/net462/xunit.console.exe %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</RunCommand>
+
+
       <MacFilesToCopy>/usr/local/opt/libomp/lib/libiomp5.dylib;/usr/local/opt/libomp/lib/libomp.dylib;</MacFilesToCopy>
       <MacFilesToCopy Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('arm64'))">/usr/local/opt/libomp/lib/libomp.dylib;</MacFilesToCopy>
     </PropertyGroup>
@@ -149,16 +161,21 @@
     <Delete Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('ubuntu'))"
       Files="@(WindowsFiles);@(OsxFiles)" />
 
+    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)testing\$(RunTestScript)"
+        OutputPath="$(TargetDir)$(RunTestScript)"
+        Properties="runCommand=$(RunCommand)" />
+
     <ItemGroup>
       <HelixWorkItem Include="%(ProjectsWithTargetFramework.Filename)">
         <PayloadDirectory>$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\</PayloadDirectory>
         <PayloadDirectory Condition="%(ProjectsWithTargetFramework.TargetFrameworks) == 'net462'">$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)\win-x64</PayloadDirectory>
-        <Command>dotnet exec --roll-forward Major --runtimeconfig %(ProjectsWithTargetFramework.Filename).runtimeconfig.json --depsfile %(ProjectsWithTargetFramework.Filename).deps.json $(HelixCorrelationPayloadPath)/xunit-runner/tools/netcoreapp2.0/xunit.console.dll %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
-        <Command Condition="$(TestTargetFramework.EndsWith('net462')) And %(ProjectsWithTargetFramework.TargetFrameworks) != 'net6.0'">$(HelixCorrelationPayloadPath)/xunit-runner/tools/net462/xunit.console.exe %(ProjectsWithTargetFramework.Filename).dll -notrait Category=SkipInCI -xml testResults.xml</Command>
+        <Command  Condition="'$(OS)' != 'Windows_NT'">./$(RunTestScript)</Command>
+        <Command  Condition="'$(OS)' == 'Windows_NT'">call $(RunTestScript)</Command>
         <Timeout>01:00:00</Timeout>
         <Timeout Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">00:30:00</Timeout>
         <Timeout Condition="'$(WorkItemTimeout)' != ''">$(WorkItemTimeout)</Timeout>
       </HelixWorkItem >
     </ItemGroup>
+
   </Target>
 </Project>