Skip to content

Commit c04d405

Browse files
michaelgsharpericstj
michaelgsharp
and
ericstj
authored
Net8 tests (dotnet#7319)
* net 8 working on windows * net core fixes * fixing job template * include net8 for helix * more net8 changes * Adding needed tfm check back. * Fixing global json * missed net upgrade. * re-adding containers * fix x86 order * arm 64 changes * arm 64 missed files * continue on error * win arm * linux arm64 * missing linux arm64 files * Removing extra parameter * test helix upload * semi colon escape * escape ampersand * fixing bash copy * upload test * cp test * arm files * relax arm constraints * missed arm file * Fixes. * data analysis sequential tests * build analysis changes * fix helix.proj * templating * reorder proj * helix changes * Helix Restore separate * fixed yml * Update build/ci/send-to-helix.yml * Fix execution of CreateHelixWorkItems target * Schedule CreateHelixWorkItems BeforeTest * helix proj change * helix proj change * Helix Updates * helix proj change * .sh test file update * more helix changes * Removing commented code * added ability to run GC after tests * adding missed files * netfx fix --------- Co-authored-by: Eric StJohn <[email protected]>
1 parent 01c4164 commit c04d405

File tree

206 files changed

+56872
-23255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+56872
-23255
lines changed

‎.vsts-dotnet-ci.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ jobs:
5252
- template: /build/ci/job-template.yml
5353
parameters:
5454
architecture: arm
55-
name: Ubuntu_x64_cross_arm_Net60
55+
name: Ubuntu_x64_cross_arm
5656
buildScript: ./build.sh
5757
container: UbuntuCrossArmContainer
5858
customMatrixes:
5959
Debug_Build:
6060
_configuration: Debug
6161
_config_short: DI
6262
_includeBenchmarkData: false
63-
_targetFramework: net6.0
63+
_targetFramework: net8.0
6464
Release_Build:
6565
_configuration: Release
6666
_config_short: RI
6767
_includeBenchmarkData: true
68-
_targetFramework: net6.0
68+
_targetFramework: net8.0
6969
innerLoop: true
7070
pool:
7171
name: NetCore-Public
@@ -75,20 +75,20 @@ jobs:
7575
- template: /build/ci/job-template.yml
7676
parameters:
7777
architecture: arm64
78-
name: Ubuntu_x64_cross_arm64_Net60
78+
name: Ubuntu_x64_cross_arm64
7979
buildScript: ./build.sh
8080
container: UbuntuCrossArm64Container
8181
customMatrixes:
8282
Debug_Build:
8383
_configuration: Debug
8484
_config_short: DI
8585
_includeBenchmarkData: false
86-
_targetFramework: net6.0
86+
_targetFramework: net8.0
8787
Release_Build:
8888
_configuration: Release
8989
_config_short: RI
9090
_includeBenchmarkData: true
91-
_targetFramework: net6.0
91+
_targetFramework: net8.0
9292
innerLoop: true
9393
pool:
9494
name: NetCore-Public
@@ -97,7 +97,7 @@ jobs:
9797

9898
- template: /build/ci/job-template.yml
9999
parameters:
100-
name: Centos_x64_Net60
100+
name: Centos_x64
101101
buildScript: ./build.sh
102102
container: CentosContainer
103103
innerLoop: true
@@ -108,7 +108,7 @@ jobs:
108108

109109
- template: /build/ci/job-template.yml
110110
parameters:
111-
name: Ubuntu_x64_Net60
111+
name: Ubuntu_x64
112112
buildScript: ./build.sh
113113
container: UbuntuContainer
114114
innerLoop: true
@@ -119,7 +119,7 @@ jobs:
119119

120120
- template: /build/ci/job-template.yml
121121
parameters:
122-
name: MacOS_x64_Net60
122+
name: MacOS_x64
123123
buildScript: ./build.sh
124124
innerLoop: true
125125
pool:
@@ -129,19 +129,19 @@ jobs:
129129
- template: /build/ci/job-template.yml
130130
parameters:
131131
architecture: arm64
132-
name: MacOS_cross_arm64_Net6
132+
name: MacOS_cross_arm64
133133
buildScript: ./build.sh
134134
customMatrixes:
135135
Debug_Build:
136136
_configuration: Debug
137137
_config_short: DI
138138
_includeBenchmarkData: false
139-
_targetFramework: net6.0
139+
_targetFramework: net8.0
140140
Release_Build:
141141
_configuration: Release
142142
_config_short: RI
143143
_includeBenchmarkData: true
144-
_targetFramework: net6.0
144+
_targetFramework: net8.0
145145
innerLoop: true
146146
pool:
147147
vmImage: macOS-13
@@ -150,19 +150,19 @@ jobs:
150150
- template: /build/ci/job-template.yml
151151
parameters:
152152
architecture: arm64
153-
name: Windows_cross_arm64_Net6
153+
name: Windows_cross_arm64
154154
buildScript: build.cmd
155155
customMatrixes:
156156
Debug_Build:
157157
_configuration: Debug
158158
_config_short: DI
159159
_includeBenchmarkData: false
160-
_targetFramework: net6.0
160+
_targetFramework: net8.0
161161
Release_Build:
162162
_configuration: Release
163163
_config_short: RI
164164
_includeBenchmarkData: false
165-
_targetFramework: net6.0
165+
_targetFramework: net8.0
166166
innerLoop: true
167167
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v6.0"
168168
pool:
@@ -172,7 +172,7 @@ jobs:
172172

173173
- template: /build/ci/job-template.yml
174174
parameters:
175-
name: Windows_x64_Net6
175+
name: Windows_x64
176176
buildScript: build.cmd
177177
innerLoop: true
178178
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
@@ -205,7 +205,7 @@ jobs:
205205

206206
- template: /build/ci/job-template.yml
207207
parameters:
208-
name: Windows_x86_Net6
208+
name: Windows_x86
209209
architecture: x86
210210
buildScript: build.cmd
211211
innerLoop: true

‎build/Codecoverage.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- We need to specify a framework in order for the Restore target to work -->
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎build/ci/job-template.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
_configuration: Debug
5252
_config_short: D
5353
_includeBenchmarkData: false
54-
_targetFramework: net6.0
54+
_targetFramework: net8.0
5555
Release_Build:
5656
_configuration: Release
5757
_config_short: R
5858
_includeBenchmarkData: true
59-
_targetFramework: net6.0
59+
_targetFramework: net8.0
6060
${{ if ne(parameters.customMatrixes, '') }}:
6161
${{ insert }}: ${{ parameters.customMatrixes }}
6262

@@ -76,7 +76,7 @@ jobs:
7676
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
7777
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
7878
displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path
79-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=True $(hardLink)
79+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=True $(hardLink)
8080
displayName: Build
8181
- ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}:
8282
- task: Bash@3
@@ -116,15 +116,15 @@ jobs:
116116
displayName: Clean up useless project
117117
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
118118
displayName: Build Nightly-Build Project with latest package versions
119-
- script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} $(testTargetFramework)
119+
- script: $(dotnetPath) msbuild $(runNightlyBuildProj) /t:RunNightlyBuildTests /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
120120
displayName: Run Nightly Build Tests
121121
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
122122
- ${{ if eq(parameters.innerLoop, 'false') }}:
123123
- ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
124-
- 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)
124+
- 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)
125125
displayName: Run All Tests.
126126
- ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
127-
- 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)
127+
- 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)
128128
displayName: Run Specific Tests.
129129
- ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
130130
- task: VSTest@2
@@ -149,7 +149,7 @@ jobs:
149149
publishRunAttachments: true
150150
- ${{ if eq(parameters.innerLoop, 'true') }}:
151151
- ${{ if eq(parameters.codeCoverage, True) }}:
152-
- 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)
152+
- 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)
153153
displayName: Run CI Tests.
154154
- ${{ if eq(parameters.codeCoverage, False) }}:
155155
- template: /build/ci/send-to-helix.yml
@@ -236,5 +236,5 @@ jobs:
236236
script: Get-ChildItem -Path '.\artifacts\bin' -Recurse | Where-Object {$_.FullName -like "*runtimes*"} | Remove-Item -Recurse -Confirm:$false -Force
237237
displayName: Clean up runtime folder for package (Unix)
238238
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
239-
- script: ${{ parameters.buildScript }} /p:Build=false -pack -ci -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} $(testTargetFramework)
239+
- script: ${{ parameters.buildScript }} /p:Build=false -pack -ci -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} $(testTargetFramework)
240240
displayName: Build Packages

‎build/ci/send-to-helix.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,31 @@ parameters:
2020
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2121

2222
steps:
23+
- script: ${{ parameters.MsBuildScript}}
24+
$(Build.SourcesDirectory)/eng/helix.proj
25+
/t:Restore
26+
/bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
27+
/p:Configuration=${{ parameters.Configuration }}
28+
/p:TargetArchitecture=${{ parameters.Architecture }}
29+
/p:BuildConfig=${{ parameters.Configuration }}
30+
/p:BuildArchitecture=${{ parameters.Architecture }}
31+
/p:HelixSource=${{ parameters.HelixSource }}
32+
/p:HelixType=${{ parameters.HelixType }}
33+
/p:HelixBuild=${{ parameters.HelixBuild }}
34+
/p:HelixConfiguration="${{ parameters.HelixConfiguration }}"
35+
/p:HelixAccessToken="${{ parameters.HelixAccessToken }}"
36+
/p:EnableXUnitReporter=${{ parameters.EnableXUnitReporter }}
37+
/p:WaitForWorkItemCompletion=${{ parameters.WaitForWorkItemCompletion }}
38+
/p:HelixBaseUri=${{ parameters.HelixBaseUri }}
39+
${{ parameters.WarnAsError }}
40+
${{ parameters.TestTargetFramework }}
41+
displayName: "Helix Restore"
42+
env:
43+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
44+
Creator: ${{ parameters.Creator }}
45+
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
46+
continueOnError: ${{ parameters.continueOnError }}
47+
2348
- script: ${{ parameters.MsBuildScript}}
2449
$(Build.SourcesDirectory)/eng/helix.proj
2550
/t:Test

‎build/codecoverage-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
_configuration: Debug
4545
_config_short: D
4646
_includeBenchmarkData: false
47-
_targetFramework: net6.0
47+
_targetFramework: net8.0
4848
codeCoverage: true
4949
pool:
5050
name: NetCore-Public

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
77
<NoWarn>$(NoWarn)</NoWarn>
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<SignAssembly>false</SignAssembly>
77
<!--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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->
77
<PublicSign>false</PublicSign>
88
</PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<SignAssembly>false</SignAssembly>
77
<!--This ensures that we can never make the mistake of adding this as a friend assembly. Please don't remove.-->

‎eng/Versions.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
9292
<FluentAssertionVersion>6.12.0</FluentAssertionVersion>
9393
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
94+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9495
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9596
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
9697
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24504.4</MicrosoftDotNetXUnitExtensionsVersion>

0 commit comments

Comments
 (0)