Skip to content

Commit 2195e37

Browse files
authored
Merge branch 'dotnet:main' into main
2 parents d177c6a + 49824f3 commit 2195e37

File tree

193 files changed

+104621
-12726
lines changed

Some content is hidden

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

193 files changed

+104621
-12726
lines changed

.github/fabricbot.json

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
"subCapability": "IssueCommentResponder",
407407
"version": "1.0",
408408
"config": {
409-
"taskName": "Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue",
409+
"taskName": "Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue that is not still untriaged",
410410
"actions": [
411411
{
412412
"name": "addLabel",
@@ -448,6 +448,74 @@
448448
"label": "needs-author-action"
449449
}
450450
},
451+
{
452+
"operator": "not",
453+
"operands": [
454+
{
455+
"name": "hasLabel",
456+
"parameters": {
457+
"label": "untriaged"
458+
}
459+
}
460+
]
461+
},
462+
{
463+
"name": "isOpen",
464+
"parameters": {}
465+
}
466+
]
467+
}
468+
}
469+
},
470+
{
471+
"taskSource": "fabricbot-config",
472+
"taskType": "trigger",
473+
"capabilityId": "IssueResponder",
474+
"subCapability": "IssueCommentResponder",
475+
"version": "1.0",
476+
"config": {
477+
"taskName": "Remove `needs-author-action` label when the author comments on an `untriaged` issue",
478+
"actions": [
479+
{
480+
"name": "removeLabel",
481+
"parameters": {
482+
"label": "needs-author-action"
483+
}
484+
}
485+
],
486+
"eventType": "issue",
487+
"eventNames": [
488+
"issue_comment"
489+
],
490+
"conditions": {
491+
"operator": "and",
492+
"operands": [
493+
{
494+
"name": "isAction",
495+
"parameters": {
496+
"action": "created"
497+
}
498+
},
499+
{
500+
"name": "isActivitySender",
501+
"parameters": {
502+
"user": {
503+
"type": "author"
504+
}
505+
}
506+
},
507+
{
508+
"name": "hasLabel",
509+
"parameters": {
510+
"label": "needs-author-action"
511+
}
512+
},
513+
{
514+
"name": "hasLabel",
515+
"parameters": {
516+
"label": "untriaged"
517+
}
518+
},
451519
{
452520
"name": "isOpen",
453521
"parameters": {}

.vsts-dotnet-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# ML.NET's PR validation build
33
################################################################################
44

5+
pr:
6+
branches:
7+
include:
8+
- main
9+
- feature/*
10+
- release/*
11+
12+
trigger:
13+
branches:
14+
include:
15+
- main
16+
- feature/*
17+
- release/*
18+
519
resources:
620
containers:
721
- container: CentosContainer

build/.night-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ schedules:
1515
branches:
1616
include:
1717
- main
18-
- releases/1.6.0
19-
- features/automl
20-
- features/integrationPackage
18+
- feature/*
19+
- release/*
2120
always: true
2221

2322
resources:

build/.outer-loop-build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ schedules:
1515
branches:
1616
include:
1717
- main
18-
- releases/1.6.0
19-
- features/automl
20-
- features/integrationPackage
18+
- feature/*
19+
- release/*
2120
always: true
2221

2322

build/ci/job-template.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
${{ if eq(parameters.codeCoverage, 'false') }}:
4545
hardLink: '/p:CreateHardLinksForCopyLocalIfPossible=True'
4646
testTargetFramework: '/p:TestTargetFramework=$(_targetFramework)'
47-
CODECOV_TOKEN: 03031e35-fe75-4e4c-87ee-e919ae601748
4847
strategy:
4948
matrix:
5049
${{ if eq(parameters.customMatrixes, '') }}:
@@ -68,7 +67,7 @@ jobs:
6867
steps:
6968
# Extra MacOS step required to install OS-specific dependencies
7069
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}:
71-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew update && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
70+
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
7271
displayName: Install MacOS build dependencies
7372
# Extra Apple MacOS step required to install OS-specific dependencies
7473
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:

build/codecoverage-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
# ML.NET's Code Coverage validation build
33
################################################################################
44

5+
pr:
6+
branches:
7+
include:
8+
- main
9+
- feature/*
10+
- release/*
11+
12+
trigger:
13+
branches:
14+
include:
15+
- main
16+
- feature/*
17+
- release/*
18+
519
jobs:
620
- template: /build/ci/job-template.yml
721
parameters:

build/libomp.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class Libomp < Formula
1515
end
1616

1717
depends_on "cmake" => :build
18-
depends_on macos: :yosemite
1918

2019
def install
2120
system "cmake", ".", *std_cmake_args

build/vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ stages:
100100
pool:
101101
vmImage: macOS-12
102102
steps:
103-
- script: brew update && rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
103+
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
104104
displayName: Install build dependencies
105105
# Only build native assets to avoid conflicts.
106106
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SystemTextJsonVersion>6.0.1</SystemTextJsonVersion>
3131
<SystemThreadingChannelsVersion>4.7.1</SystemThreadingChannelsVersion>
3232
<!-- Other product dependencies -->
33-
<ApacheArrowVersion>2.0.0</ApacheArrowVersion>
33+
<ApacheArrowVersion>11.0.0</ApacheArrowVersion>
3434
<GoogleProtobufVersion>3.19.6</GoogleProtobufVersion>
3535
<LightGBMVersion>2.3.1</LightGBMVersion>
3636
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisAnalyzersVersion>

eng/helix.proj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@
9999
<HelixPreCommands Condition="$(IsPosixShell)">$(HelixPreCommands);export ML_TEST_DATADIR=$HELIX_CORRELATION_PAYLOAD;export MICROSOFTML_RESOURCE_PATH=$HELIX_WORKITEM_ROOT;sudo chmod -R 777 $HELIX_WORKITEM_ROOT;sudo chown -R $USER $HELIX_WORKITEM_ROOT</HelixPreCommands>
100100
<HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set ML_TEST_DATADIR=%HELIX_CORRELATION_PAYLOAD%;set MICROSOFTML_RESOURCE_PATH=%HELIX_WORKITEM_ROOT%</HelixPreCommands>
101101

102-
<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">$(HelixPreCommands);install_name_tool -change "/usr/local/opt/libomp/lib/libomp.dylib" "@loader_path/libomp.dylib" libSymSgdNative.dylib</HelixPreCommands>
103-
<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">$(HelixPreCommands);install_name_tool -change "/usr/local/opt/libomp/lib/libomp.dylib" "@loader_path/libomp.dylib" runtimes/osx-x64/native/lib_lightgbm.dylib</HelixPreCommands>
104-
<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">$(HelixPreCommands);install_name_tool -change "/usr/local/opt/libomp/lib/libomp.dylib" "@loader_path/libomp.dylib" runtimes/osx-x64/native/libonnxruntime.dylib</HelixPreCommands>
105102
<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">$(HelixPreCommands);export LD_LIBRARY_PATH=/opt/homebrew/opt/mono-libgdiplus/lib;</HelixPreCommands>
106103

107104
<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('armarch'))">$(HelixPreCommands);sudo apt update;sudo apt-get install libomp-dev libomp5 -y</HelixPreCommands>
@@ -122,6 +119,15 @@
122119
DestinationFolder="$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)">
123120
</Copy>
124121

122+
<Exec Condition="Exists('$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)\libSymSgdNative.dylib') AND $(HelixTargetQueues.ToLowerInvariant().Contains('osx'))"
123+
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@loader_path/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/libSymSgdNative.dylib" />
124+
125+
<Exec Condition="Exists('$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)\runtimes\osx-x64\native\lib_lightgbm.dylib') AND $(HelixTargetQueues.ToLowerInvariant().Contains('osx'))"
126+
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@loader_path/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/runtimes/osx-x64/native/lib_lightgbm.dylib" />
127+
128+
<Exec Condition="Exists('$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)\runtimes\osx-x64\native\libonnxruntime.dylib') AND $(HelixTargetQueues.ToLowerInvariant().Contains('osx'))"
129+
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@loader_path/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/runtimes/osx-x64/native/libonnxruntime.dylib" />
130+
125131
<!-- Remove the native libraries for other OS to save on payload size -->
126132
<ItemGroup>
127133
<WindowsFiles Include="$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)\runtimes\win*\**\*.*"/>

0 commit comments

Comments
 (0)