Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelgsharp merged 48 commits into from
Dec 16, 2024
Merged

Net8 tests #7319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5e6ed1a
net 8 working on windows
michaelgsharp Nov 20, 2024
d495c4c
net core fixes
michaelgsharp Nov 20, 2024
2535418
fixing job template
michaelgsharp Nov 20, 2024
cb78448
include net8 for helix
michaelgsharp Nov 20, 2024
f84fb69
more net8 changes
michaelgsharp Nov 20, 2024
489fab9
Adding needed tfm check back.
michaelgsharp Nov 20, 2024
39f7807
Fixing global json
michaelgsharp Nov 20, 2024
66b130c
missed net upgrade.
michaelgsharp Nov 20, 2024
1301e6d
re-adding containers
michaelgsharp Nov 20, 2024
e84ec25
fix x86 order
michaelgsharp Nov 21, 2024
d7eb263
arm 64 changes
michaelgsharp Nov 21, 2024
fae4a9a
arm 64 missed files
michaelgsharp Nov 21, 2024
4da3877
continue on error
michaelgsharp Nov 22, 2024
faa175d
win arm
michaelgsharp Nov 22, 2024
e797c19
linux arm64
michaelgsharp Nov 22, 2024
2f5047e
missing linux arm64 files
michaelgsharp Nov 22, 2024
e23e47b
Removing extra parameter
michaelgsharp Nov 22, 2024
ffa86df
test helix upload
michaelgsharp Nov 22, 2024
16fad35
semi colon escape
michaelgsharp Nov 23, 2024
47439ba
escape ampersand
michaelgsharp Nov 23, 2024
a19afa9
fixing bash copy
michaelgsharp Nov 23, 2024
a638909
upload test
michaelgsharp Nov 26, 2024
af004c4
cp test
michaelgsharp Nov 26, 2024
ed44308
arm files
michaelgsharp Dec 4, 2024
44f3cb4
relax arm constraints
michaelgsharp Dec 4, 2024
5e23157
missed arm file
michaelgsharp Dec 4, 2024
fe40b56
Fixes.
michaelgsharp Dec 7, 2024
22dd928
data analysis sequential tests
michaelgsharp Dec 8, 2024
b5b7c35
build analysis changes
michaelgsharp Dec 9, 2024
3993097
fix helix.proj
michaelgsharp Dec 9, 2024
36ccf7c
templating
michaelgsharp Dec 9, 2024
fc88832
reorder proj
michaelgsharp Dec 9, 2024
5ca091a
helix changes
michaelgsharp Dec 10, 2024
577e4ae
Helix Restore separate
michaelgsharp Dec 11, 2024
12eeb26
fixed yml
michaelgsharp Dec 11, 2024
9090999
Update build/ci/send-to-helix.yml
ericstj Dec 11, 2024
a6f1973
Fix execution of CreateHelixWorkItems target
ericstj Dec 11, 2024
0f68e7f
Schedule CreateHelixWorkItems BeforeTest
ericstj Dec 11, 2024
86504cc
helix proj change
michaelgsharp Dec 11, 2024
85e0d96
helix proj change
michaelgsharp Dec 11, 2024
86b682c
Helix Updates
michaelgsharp Dec 12, 2024
00f6347
helix proj change
michaelgsharp Dec 12, 2024
a0ff186
.sh test file update
michaelgsharp Dec 12, 2024
923b6fe
more helix changes
michaelgsharp Dec 12, 2024
79ec095
Removing commented code
michaelgsharp Dec 12, 2024
25b5301
added ability to run GC after tests
michaelgsharp Dec 12, 2024
4e137f3
adding missed files
michaelgsharp Dec 12, 2024
278b277
netfx fix
michaelgsharp Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Codecoverage.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
16 changes: 8 additions & 8 deletions build/ci/job-template.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
25 changes: 25 additions & 0 deletions build/ci/send-to-helix.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.
/bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog

@ericstjericstjDec 11, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.

/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
Expand Down
2 changes: 1 addition & 1 deletion build/codecoverage-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
_configuration: Debug
_config_short: D
_includeBenchmarkData: false
_targetFramework: net6.0
_targetFramework: net8.0
codeCoverage: true
pool:
name: NetCore-Public
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<NoWarn>$(NoWarn)</NoWarn>

Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Net8 tests#7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

michaelgsharp
merged 48 commits into

from

Dec 16, 2024
 Merged


Net8 tests
#7319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


48 commits


Select commit
Hold shift + click to select a range
5e6ed1a

net 8 working on windows


michaelgsharp Nov 20, 2024
d495c4c

net core fixes


michaelgsharp Nov 20, 2024
2535418

fixing job template


michaelgsharp Nov 20, 2024
cb78448

include net8 for helix


michaelgsharp Nov 20, 2024
f84fb69

more net8 changes


michaelgsharp Nov 20, 2024
489fab9

Adding needed tfm check back.


michaelgsharp Nov 20, 2024
39f7807

Fixing global json


michaelgsharp Nov 20, 2024
66b130c

missed net upgrade.


michaelgsharp Nov 20, 2024
1301e6d

re-adding containers


michaelgsharp Nov 20, 2024
e84ec25

fix x86 order


michaelgsharp Nov 21, 2024
d7eb263

arm 64 changes


michaelgsharp Nov 21, 2024
fae4a9a

arm 64 missed files


michaelgsharp Nov 21, 2024
4da3877

continue on error


michaelgsharp Nov 22, 2024
faa175d

win arm


michaelgsharp Nov 22, 2024
e797c19

linux arm64


michaelgsharp Nov 22, 2024
2f5047e

missing linux arm64 files


michaelgsharp Nov 22, 2024
e23e47b

Removing extra parameter


michaelgsharp Nov 22, 2024
ffa86df

test helix upload


michaelgsharp Nov 22, 2024
16fad35

semi colon escape


michaelgsharp Nov 23, 2024
47439ba

escape ampersand


michaelgsharp Nov 23, 2024
a19afa9

fixing bash copy


michaelgsharp Nov 23, 2024
a638909

upload test


michaelgsharp Nov 26, 2024
af004c4

cp test


michaelgsharp Nov 26, 2024
ed44308

arm files


michaelgsharp Dec 4, 2024
44f3cb4

relax arm constraints


michaelgsharp Dec 4, 2024
5e23157

missed arm file


michaelgsharp Dec 4, 2024
fe40b56

Fixes.


michaelgsharp Dec 7, 2024
22dd928

data analysis sequential tests


michaelgsharp Dec 8, 2024
b5b7c35

build analysis changes


michaelgsharp Dec 9, 2024
3993097

fix helix.proj


michaelgsharp Dec 9, 2024
36ccf7c

templating


michaelgsharp Dec 9, 2024
fc88832

reorder proj


michaelgsharp Dec 9, 2024
5ca091a

helix changes


michaelgsharp Dec 10, 2024
577e4ae

Helix Restore separate


michaelgsharp Dec 11, 2024
12eeb26

fixed yml


michaelgsharp Dec 11, 2024
9090999

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


ericstj Dec 11, 2024
a6f1973

Fix execution of CreateHelixWorkItems target


ericstj Dec 11, 2024
0f68e7f

Schedule CreateHelixWorkItems BeforeTest


ericstj Dec 11, 2024
86504cc

helix proj change


michaelgsharp Dec 11, 2024
85e0d96

helix proj change


michaelgsharp Dec 11, 2024
86b682c

Helix Updates


michaelgsharp Dec 12, 2024
00f6347

helix proj change


michaelgsharp Dec 12, 2024
a0ff186

.sh test file update


michaelgsharp Dec 12, 2024
923b6fe

more helix changes


michaelgsharp Dec 12, 2024
79ec095

Removing commented code


michaelgsharp Dec 12, 2024
25b5301

added ability to run GC after tests


michaelgsharp Dec 12, 2024
4e137f3

adding missed files


michaelgsharp Dec 12, 2024
278b277

netfx fix


michaelgsharp Dec 13, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 17 additions & 17 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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
Expand All@@ -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:
Expand All@@ -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"
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
build/Codecoverage.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

16 changes: 8 additions & 8 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}

Expand All@@ -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
Expand DownExpand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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

25 changes: 25 additions & 0 deletions
build/ci/send-to-helix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Comment thread
ericstj marked this conversation as resolved.

 /bl:$(Build.SourcesDirectory)/artifacts/log/${{ parameters.Configuration }}/SendToHelix.binlog
@ericstjericstjDec 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses the same log as below, also most of these parameters are not needed for restore. I imagine this step is just temporary until we refactor in a follow up PR though.
 /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
Expand Down

2 changes: 1 addition & 1 deletion
build/codecoverage-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ jobs:
 _configuration: Debug
 _config_short: D
 _includeBenchmarkData: false
 _targetFramework: net6.0
 _targetFramework: net8.0
 codeCoverage: true
 pool:
 name: NetCore-Public
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <OutputType>Exe</OutputType>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
 <NoWarn>$(NoWarn)</NoWarn>

Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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.-->
Expand Down

1 change: 1 addition & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
Loading