Windows CI working#5477

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 14 commits into from
Nov 7, 2020
Merged

Windows CI working #5477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2700e97
ci testing changes
michaelgsharp Nov 4, 2020
bddec92
more testing
michaelgsharp Nov 4, 2020
bd1aed7
more testing
michaelgsharp Nov 4, 2020
09b3a2f
more testing
michaelgsharp Nov 4, 2020
06fd705
more testing
michaelgsharp Nov 4, 2020
8b02145
more testing
michaelgsharp Nov 4, 2020
73f932c
more testing
michaelgsharp Nov 4, 2020
5c98847
more testing
michaelgsharp Nov 5, 2020
ca5664c
more testing
michaelgsharp Nov 5, 2020
696e5ae
more testing changes
michaelgsharp Nov 6, 2020
4c95f1d
more testing changes
michaelgsharp Nov 6, 2020
2d24581
test result logs
michaelgsharp Nov 6, 2020
7e4065a
comments from pr
michaelgsharp Nov 7, 2020
4bc10a7
comments from pr
michaelgsharp Nov 7, 2020
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
70 changes: 35 additions & 35 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
containers:
- container: CentosContainer
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

- container: UbuntuContainer
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
parameters:
name: Centos_x64_NetCoreApp31
buildScript: ./build.sh
container: CentosContainer
customMatrixes:
Debug_Build:
_configuration: Debug-netcoreapp3_1
_config_short: DI
_includeBenchmarkData: false
_targetFramework: netcoreapp3.1
Release_Build:
_configuration: Release-netcoreapp3_1
_config_short: RI
_includeBenchmarkData: true
_targetFramework: netcoreapp3.1
innerLoop: true
pool:
name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
# parameters:
# name: Centos_x64_NetCoreApp31
# buildScript: ./build.sh
# container: CentosContainer
# customMatrixes:
# Debug_Build:
# _configuration: Debug-netcoreapp3_1
# _config_short: DI
# _includeBenchmarkData: false
# _targetFramework: netcoreapp3.1
# Release_Build:
# _configuration: Release-netcoreapp3_1
# _config_short: RI
# _includeBenchmarkData: true
# _targetFramework: netcoreapp3.1
# innerLoop: true
# pool:
# name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
parameters:
name: Ubuntu_x64_NetCoreApp21
buildScript: ./build.sh
container: UbuntuContainer
innerLoop: true
pool:
name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
# parameters:
# name: Ubuntu_x64_NetCoreApp21
# buildScript: ./build.sh
# container: UbuntuContainer
# innerLoop: true
# pool:
# name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
parameters:
name: MacOS_x64_NetCoreApp21
buildScript: ./build.sh
innerLoop: true
pool:
name: Hosted macOS
# - template: /build/ci/job-template.yml
# parameters:
# name: MacOS_x64_NetCoreApp21
# buildScript: ./build.sh
# innerLoop: true
# pool:
# name: Hosted macOS

- template: /build/ci/job-template.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%
60 changes: 28 additions & 32 deletions build/ci/job-template.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
name: ''
architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
timeoutInMinutes: 120
cancelTimeoutInMinutes: 10
variables:
dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
_targetFramework: netcoreapp2.1
${{ if ne(parameters.customMatrixes, '') }}:
${{ insert }}: ${{ parameters.customMatrixes }}

pool: ${{ parameters.pool }}
${{ if ne(parameters.container, '') }}:
container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
- 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) -buildArch=${{ parameters.architecture }}
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
displayName: Build
- ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
- task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
- ${{ if eq(parameters.buildScript, 'build.cmd') }}:
- task: PowerShell@2
inputs:
targetType: inline
script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
# TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
# - task: PowerShell@2
# inputs:
# targetType: inline
# script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
# displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
- script: dir /s "bin"
displayName: show bin folder disk usage
- ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
Select -ExpandProperty FullName |
Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
sort length -Descending |
Remove-Item -force
sort length -Descending |
Remove-Item -force
Write-Output "Done cleaning up usless project..."
displayName: Clean up useless project
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
displayName: Build Nightly-Build Project with latest package versions
- script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
displayName: Run Nightly Build Tests
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
- script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
displayName: Download Benchmark Data
timeoutInMinutes: 10
- script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
displayName: Download Tensorflow Meta File
timeoutInMinutes: 20
- ${{ if eq(parameters.innerLoop, 'false') }}:
- ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
- script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
# TODO: Code coverage needs to be fixed.
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
displayName: Run All Tests.
- ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
- script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
displayName: Run Specific Tests.
- ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
- task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
testAssemblyVer2: |
**\*test.dll
**\*tests.dll
!**\obj\**
!**\obj\**
runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
searchFolder: '$(System.DefaultWorkingDirectory)'
vstestLocationMethod: 'version'
vstestLocationMethod: 'version'
vsTestVersion: 'latest'
runInParallel: False
runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
collectDumpOn: onAbortOnly
publishRunAttachments: true
- ${{ if eq(parameters.innerLoop, 'true') }}:
- script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
displayName: Run CI Tests.
- script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
- script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
displayName: Upload coverage to codecov.io
condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'
searchFolder: '$(System.DefaultWorkingDirectory)/bin'
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
displayName: Stage build logs
condition: not(succeeded())
inputs:
sourceFolder: $(Build.SourcesDirectory)
contents: '?(msbuild.*|binclash.log|init-tools.log)'
targetFolder: $(Build.ArtifactStagingDirectory)
sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
contents: '**'
targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
- task: CopyFiles@2
displayName: Stage test output
condition: not(succeeded())
inputs:
sourceFolder: $(Build.SourcesDirectory)/bin
sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
contents: |
**/TestOutput/**/*
**/*.trx
**
targetFolder: $(Build.ArtifactStagingDirectory)
- task: CopyFiles@2
displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
contents: |
*.dmp
CrashDumps/*.dmp
bin/**/*.pdb
artifacts/bin/**/*.pdb
targetFolder: $(Build.ArtifactStagingDirectory)
- task: PublishBuildArtifacts@1
displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
artifactName: ${{ parameters.name }} $(_config_short)
artifactType: container
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
- script: ${{ parameters.buildScript }} -buildPackages
- script: ${{ parameters.buildScript }} -pack -ci
displayName: Build Packages
16 changes: 8 additions & 8 deletions build/vsts-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
_TeamName: DotNetCore
queue:
name: DotNetCore-Build
demands:
demands:
- agent.os -equals Windows_NT
steps:

Expand All@@ -91,7 +91,7 @@ phases:
# Only build native assets to avoid conflicts.
- script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
displayName: Build

- task: MSBuild@1
displayName: Sign Windows_x86 Binaries
inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
_TeamName: DotNetCore
queue:
name: DotNetCore-Build
demands:
demands:
- agent.os -equals Windows_NT
steps:

Expand All@@ -140,7 +140,7 @@ phases:
continueOnError: false
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

# Build both native and managed assets.
# Build both native and managed assets.
- script: ./build.cmd -$(BuildConfig)
displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
verbosity: 'Verbose'
alertWarningLevel: 'High'


- task: MSBuild@1
displayName: Sign Windows_x64 Binaries
inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
_MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
queue:
name: DotNetCore-Build
demands:
demands:
- agent.os -equals Windows_NT
steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
inputs:
sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

- script: ./build.cmd -buildPackages
displayName: Create Packages

Expand Down
, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down

, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down

, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down

, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down

, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down

, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down

, '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
Windows CI working#5477

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 14 commits into

from

Nov 7, 2020
 Merged


Windows CI working
#5477
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
2700e97

ci testing changes


michaelgsharp Nov 4, 2020
bddec92

more testing


michaelgsharp Nov 4, 2020
bd1aed7

more testing


michaelgsharp Nov 4, 2020
09b3a2f

more testing


michaelgsharp Nov 4, 2020
06fd705

more testing


michaelgsharp Nov 4, 2020
8b02145

more testing


michaelgsharp Nov 4, 2020
73f932c

more testing


michaelgsharp Nov 4, 2020
5c98847

more testing


michaelgsharp Nov 5, 2020
ca5664c

more testing


michaelgsharp Nov 5, 2020
696e5ae

more testing changes


michaelgsharp Nov 6, 2020
4c95f1d

more testing changes


michaelgsharp Nov 6, 2020
2d24581

test result logs


michaelgsharp Nov 6, 2020
7e4065a

comments from pr


michaelgsharp Nov 7, 2020
4bc10a7

comments from pr


michaelgsharp Nov 7, 2020

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


70 changes: 35 additions & 35 deletions
.vsts-dotnet-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,47 +6,47 @@ resources:
 containers:
 - container: CentosContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033

 - container: UbuntuContainer
 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8

jobs:
- template: /build/ci/job-template.yml
 parameters:
 name: Centos_x64_NetCoreApp31
 buildScript: ./build.sh
 container: CentosContainer
 customMatrixes:
 Debug_Build:
 _configuration: Debug-netcoreapp3_1
 _config_short: DI
 _includeBenchmarkData: false
 _targetFramework: netcoreapp3.1
 Release_Build:
 _configuration: Release-netcoreapp3_1
 _config_short: RI
 _includeBenchmarkData: true
 _targetFramework: netcoreapp3.1
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Centos_x64_NetCoreApp31
#  buildScript: ./build.sh
#  container: CentosContainer
#  customMatrixes:
#  Debug_Build:
#  _configuration: Debug-netcoreapp3_1
#  _config_short: DI
#  _includeBenchmarkData: false
#  _targetFramework: netcoreapp3.1
#  Release_Build:
#  _configuration: Release-netcoreapp3_1
#  _config_short: RI
#  _includeBenchmarkData: true
#  _targetFramework: netcoreapp3.1
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: Ubuntu_x64_NetCoreApp21
 buildScript: ./build.sh
 container: UbuntuContainer
 innerLoop: true
 pool:
 name: Hosted Ubuntu 1604
# - template: /build/ci/job-template.yml
#  parameters:
#  name: Ubuntu_x64_NetCoreApp21
#  buildScript: ./build.sh
#  container: UbuntuContainer
#  innerLoop: true
#  pool:
#  name: Hosted Ubuntu 1604

- template: /build/ci/job-template.yml
 parameters:
 name: MacOS_x64_NetCoreApp21
 buildScript: ./build.sh
 innerLoop: true
 pool:
 name: Hosted macOS
# - template: /build/ci/job-template.yml
#  parameters:
#  name: MacOS_x64_NetCoreApp21
#  buildScript: ./build.sh
#  innerLoop: true
#  pool:
#  name: Hosted macOS

- template: /build/ci/job-template.yml
 parameters:
Expand Down

2 changes: 1 addition & 1 deletion
build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -pack -warnAsError 0 %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
exit /b %ErrorLevel%

60 changes: 28 additions & 32 deletions
build/ci/job-template.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
#TODO: Need to update build documentation.
parameters:
 name: ''
 architecture: x64
Expand All@@ -21,7 +22,7 @@ jobs:
 timeoutInMinutes: 120
 cancelTimeoutInMinutes: 10
 variables:
 dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
 dotnetPath: $(Build.SourcesDirectory)/.dotnet/dotnet
 nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
 nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
 nightlyBuildRunPath: $(Build.SourcesDirectory)/bin/AnyCPU.$(_configuration)/Microsoft.ML.NightlyBuild.Tests/$(_targetFramework)
Expand All@@ -43,7 +44,7 @@ jobs:
 _targetFramework: netcoreapp2.1
 ${{ if ne(parameters.customMatrixes, '') }}:
 ${{ insert }}: ${{ parameters.customMatrixes }}

 pool: ${{ parameters.pool }}
 ${{ if ne(parameters.container, '') }}:
 container: ${{ parameters.container }}
Expand All@@ -55,7 +56,7 @@ jobs:
 - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
 - 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) -buildArch=${{ parameters.architecture }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build
 - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
 - task: Bash@3
Expand All@@ -70,11 +71,12 @@ jobs:
 script: cd packages;find . -type d -path "*/runtimes/osx-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd ..
 displayName: Clean up non-Linux runtime folders of NuGet Packages to save disk space
 - ${{ if eq(parameters.buildScript, 'build.cmd') }}:
 - task: PowerShell@2
 inputs:
 targetType: inline
 script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 # TODO: We need to do this. THe packages are restored in a different folder so we need find the correct path.
 # - task: PowerShell@2
 # inputs:
 # targetType: inline
 # script: Get-ChildItem -Path '.\packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
 # displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
 - script: dir /s "bin"
 displayName: show bin folder disk usage
 - ${{ if eq(parameters.nightlyBuild, 'true') }}:
Expand All@@ -89,27 +91,22 @@ jobs:
 Get-ChildItem -Path '.\bin\AnyCPU.*' -Recurse |
 Select -ExpandProperty FullName |
 Where {$_ -notlike '*\Microsoft.ML.NightlyBuild.Tests*'} |
 sort length -Descending |
 Remove-Item -force
 sort length -Descending |
 Remove-Item -force
 Write-Output "Done cleaning up usless project..."
 displayName: Clean up useless project
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" /p:Configuration=$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 - script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
 displayName: Build Nightly-Build Project with latest package versions
 - script: ${{ parameters.buildScript }} -$(_configuration) -runnightlybuildtests
 displayName: Run Nightly Build Tests
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -- /t:DownloadExternalTestFiles /p:IncludeBenchmarkData=$(_includeBenchmarkData)
 displayName: Download Benchmark Data
 timeoutInMinutes: 10
 - script: ${{ parameters.buildScript }} -- /t:DownloadTensorflowMetaFiles /p:IncludeTensorflowMetaFile=true
 displayName: Download Tensorflow Meta File
 timeoutInMinutes: 20
 - ${{ if eq(parameters.innerLoop, 'false') }}:
 - ${{ if and(eq(parameters.runSpecific, 'false'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
 # TODO: Code coverage needs to be fixed.
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run All Tests.
 - ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runSpecificTests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -ci /p:TestRunnerAdditionalArguments=-trait%20Category=RunSpecificTest #-coverage=${{ parameters.codeCoverage }}
 displayName: Run Specific Tests.
 - ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
 - task: VSTest@2
Expand All@@ -119,10 +116,10 @@ jobs:
 testAssemblyVer2: |
 **\*test.dll
 **\*tests.dll
 !**\obj\**
 !**\obj\**
 runSettingsFile: $(Build.SourcesDirectory)/tools-local/vstest.runsettings
 searchFolder: '$(System.DefaultWorkingDirectory)'
 vstestLocationMethod: 'version'
 vstestLocationMethod: 'version'
 vsTestVersion: 'latest'
 runInParallel: False
 runTestsInIsolation: True
Expand All@@ -133,17 +130,17 @@ jobs:
 collectDumpOn: onAbortOnly
 publishRunAttachments: true
 - ${{ if eq(parameters.innerLoop, 'true') }}:
 - script: ${{ parameters.buildScript }} -$(_configuration) -runCITests -coverage=${{ parameters.codeCoverage }}
 - script: ${{ parameters.buildScript }} -configuration $(_configuration) -test -ci /p:TestRunnerAdditionalArguments=-notrait%20Category=SkipInCI #-coverage=${{ parameters.codeCoverage }}
 displayName: Run CI Tests.
 - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
 - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
 displayName: Upload coverage to codecov.io
 condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
 - task: PublishTestResults@2
 displayName: Publish Test Results
 condition: succeededOrFailed()
 inputs:
 testRunner: 'vSTest'
 searchFolder: '$(System.DefaultWorkingDirectory)/bin'
 searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
 testResultsFiles: '**/*.trx'
 testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
 configuration: $(_configuration)
Expand All@@ -152,17 +149,16 @@ jobs:
 displayName: Stage build logs
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)
 contents: '?(msbuild.*|binclash.log|init-tools.log)'
 targetFolder: $(Build.ArtifactStagingDirectory)
 sourceFolder: $(Build.SourcesDirectory)/artifacts/log/
 contents: '**'
 targetFolder: $(Build.ArtifactStagingDirectory)artifacts/log/
 - task: CopyFiles@2
 displayName: Stage test output
 condition: not(succeeded())
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin
 sourceFolder: $(Build.SourcesDirectory)/artifacts/TestResults
 contents: |
 **/TestOutput/**/*
 **/*.trx
 **
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: CopyFiles@2
 displayName: Stage process dump and pdb if any
Expand All@@ -172,7 +168,7 @@ jobs:
 contents: |
 *.dmp
 CrashDumps/*.dmp
 bin/**/*.pdb
artifacts/bin/**/*.pdb
 targetFolder: $(Build.ArtifactStagingDirectory)
 - task: PublishBuildArtifacts@1
 displayName: Publish build and test logs
Expand All@@ -182,5 +178,5 @@ jobs:
 artifactName: ${{ parameters.name }} $(_config_short)
 artifactType: container
 - ${{ if eq(parameters.nightlyBuild, 'false') }}:
 - script: ${{ parameters.buildScript }} -buildPackages
 - script: ${{ parameters.buildScript }} -pack -ci
 displayName: Build Packages

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
################################################################################
# ML.NET's official, signed build
# ML.NET's official, signed build
################################################################################

resources:
Expand DownExpand Up@@ -73,7 +73,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -91,7 +91,7 @@ phases:
 # Only build native assets to avoid conflicts.
 - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
 displayName: Build

 - task: MSBuild@1
 displayName: Sign Windows_x86 Binaries
 inputs:
Expand DownExpand Up@@ -125,7 +125,7 @@ phases:
 _TeamName: DotNetCore
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand All@@ -140,7 +140,7 @@ phases:
 continueOnError: false
 condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

 # Build both native and managed assets.
 # Build both native and managed assets.
 - script: ./build.cmd -$(BuildConfig)
 displayName: Build

Expand All@@ -150,7 +150,7 @@ phases:
 verbosity: 'Verbose'
 alertWarningLevel: 'High'


 - task: MSBuild@1
 displayName: Sign Windows_x64 Binaries
 inputs:
Expand DownExpand Up@@ -192,7 +192,7 @@ phases:
 _MsdlSymbolServerPath: https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection
 queue:
 name: DotNetCore-Build
 demands:
 demands:
 - agent.os -equals Windows_NT
 steps:

Expand DownExpand Up@@ -221,7 +221,7 @@ phases:
 inputs:
 sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
 targetFolder: $(Build.SourcesDirectory)/bin/obj/packages

 - script: ./build.cmd -buildPackages
 displayName: Create Packages

Expand Down