Skip to content

Commit 4bf2892

Browse files
tannergoodingtannergooding
committed
Merge remote-tracking branch 'dotnet/main' into generic-math
2 parents 42e1464 + 8818c15 commit 4bf2892

File tree

180 files changed

+1829
-1020
lines changed

Some content is hidden

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

180 files changed

+1829
-1020
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
4545
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
4646
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
47+
<NetCoreAppMinimum>netcoreapp3.1</NetCoreAppMinimum>
4748
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>
4849
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
4950
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
@@ -208,7 +209,7 @@
208209
<MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir>
209210
<MicrosoftNetCoreAppRefPackDataDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data'))</MicrosoftNetCoreAppRefPackDataDir>
210211

211-
<MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(Configuration)'))</MicrosoftNetCoreAppRuntimePackDir>
212+
<MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(LibrariesConfiguration)'))</MicrosoftNetCoreAppRuntimePackDir>
212213
<MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(PackageRID)'))</MicrosoftNetCoreAppRuntimePackRidDir>
213214
<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'lib', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
214215
<MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>

‎docs/area-owners.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
99
| Area | Lead | Owners (area experts to tag in PR's and issues) | Notes |
1010
|------------------------------------------------|---------------|-----------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1111
| area-AssemblyLoader-coreclr | @agocke | @agocke @vitek-karas @vsadov | |
12-
| area-AssemblyLoader-mono | @SamMonoRT | @CoffeeFlux | |
12+
| area-AssemblyLoader-mono | @SamMonoRT | @lambdageek | |
1313
| area-Build-mono | @steveisok | @akoeplinger | |
1414
| area-Codegen-AOT-mono | @SamMonoRT | @vargaz | |
1515
| area-CodeGen-coreclr | @JulieLeeMSFT | @BruceForstall @dotnet/jit-contrib | |
@@ -105,7 +105,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
105105
| area-System.Numerics | @jeffhandley | @pgovind @tannergooding | |
106106
| area-System.Numerics.Tensors | @jeffhandley | @pgovind @tannergooding | |
107107
| area-System.Reflection | @jeffhandley | @buyaa-n @joperezr @krwq @steveharter | Consultants: @GrabYourPitchforks |
108-
| area-System.Reflection-mono | @SamMonoRT | @lambdageek @CoffeeFlux | MonoVM-specific reflection and reflection-emit issues |
108+
| area-System.Reflection-mono | @SamMonoRT | @lambdageek | MonoVM-specific reflection and reflection-emit issues |
109109
| area-System.Reflection.Emit | @jeffhandley | @buyaa-n @joperezr @krwq @steveharter | Consultants: @GrabYourPitchforks |
110110
| area-System.Reflection.Metadata | @jeffhandley | @buyaa-n @joperezr @krwq @steveharter | Consultants: @GrabYourPitchforks @tmat |
111111
| area-System.Resources | @jeffhandley | @buyaa-n @joperezr @krwq | |
@@ -136,7 +136,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
136136
| area-TypeSystem-coreclr | @mangod9 | @davidwrighton @MichalStrehovsky @janvorli @mangod9 | |
137137
| area-UWP | @tommcdon | @jashook | UWP-specific issues including Microsoft.NETCore.UniversalWindowsPlatform and Microsoft.Net.UWPCoreRuntimeSdk |
138138
| area-VM-coreclr | @mangod9 | @mangod9 | |
139-
| area-VM-meta-mono | @SamMonoRT | @lambdageek @CoffeeFlux | |
139+
| area-VM-meta-mono | @SamMonoRT | @lambdageek | |
140140

141141
## Operating Systems
142142

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
<Uri>https://github.com/dotnet/icu</Uri>
55
<Sha>59588c1257a842089d0b7df3bad1cdd69ac720e1</Sha>
66
</Dependency>
7+
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21328.2">
8+
<Uri>https://github.com/dotnet/msquic</Uri>
9+
<Sha>d7db669b70f4dd67ec001c192f9809c218cab88b</Sha>
10+
</Dependency>
711
</ProductDependencies>
812
<ToolsetDependencies>
913
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21321.1">

‎eng/Versions.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<!-- Code analysis dependencies -->
51-
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
52-
<MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
53-
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21320.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
51+
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
52+
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
53+
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21324.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
5454
<!-- Arcade dependencies -->
5555
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21321.1</MicrosoftDotNetApiCompatVersion>
5656
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21321.1</MicrosoftDotNetBuildTasksFeedVersion>
@@ -168,6 +168,8 @@
168168
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
169169
<!-- ICU -->
170170
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.7.21315.3</MicrosoftNETCoreRuntimeICUTransportVersion>
171+
<!-- MsQuic -->
172+
<SystemNetMsQuicTransportVersion>6.0.0-preview.7.21328.2</SystemNetMsQuicTransportVersion>
171173
<!-- Mono LLVM -->
172174
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21314.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
173175
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21314.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

‎eng/liveBuilds.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<LibrariesAllConfigShippingPackagesDir>$([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'Shipping'))</LibrariesAllConfigShippingPackagesDir>
3636
<LibrariesAllConfigNonShippingPackagesDir>$([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'NonShipping'))</LibrariesAllConfigNonShippingPackagesDir>
3737

38-
<LibrariesSharedFrameworkRefArtifactsPath Condition="'$(LibrariesSharedFrameworkRefArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)'))</LibrariesSharedFrameworkRefArtifactsPath>
38+
<LibrariesSharedFrameworkRefArtifactsPath Condition="'$(LibrariesSharedFrameworkRefArtifactsPath)' == ''">$(MicrosoftNetCoreAppRefPackRefDir)</LibrariesSharedFrameworkRefArtifactsPath>
3939
<LibrariesAllRefArtifactsPath Condition="'$(LibrariesAllRefArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', '$(NetCoreAppCurrent)'))</LibrariesAllRefArtifactsPath>
40-
<LibrariesSharedFrameworkBinArtifactsPath Condition="'$(LibrariesSharedFrameworkBinArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'pkg', '$(NetCoreAppCurrent)', 'runtime'))$(LibrariesTargetOSConfigurationArchitecture)\</LibrariesSharedFrameworkBinArtifactsPath>
40+
<LibrariesSharedFrameworkBinArtifactsPath Condition="'$(LibrariesSharedFrameworkBinArtifactsPath)' == ''">$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</LibrariesSharedFrameworkBinArtifactsPath>
4141
<LibrariesAllBinArtifactsPath Condition="'$(LibrariesAllBinArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'runtime'))$(NetCoreAppCurrent)-$(LibrariesTargetOSConfigurationArchitecture)\</LibrariesAllBinArtifactsPath>
4242
<LibrariesNativeArtifactsPath Condition="'$(LibrariesNativeArtifactsPath)' == ''">$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'native'))$(NetCoreAppCurrent)-$(LibrariesTargetOSConfigurationArchitecture)\</LibrariesNativeArtifactsPath>
4343

‎eng/pipelines/coreclr/perf.yml‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
runtimeFlavor: mono
4242
buildConfig: release
4343
platforms:
44-
- Linux_arm64
4544
- Linux_x64
4645

4746
# build coreclr and libraries
@@ -50,29 +49,10 @@ jobs:
5049
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
5150
buildConfig: release
5251
platforms:
53-
- Linux_arm64
5452
- Linux_x64
5553
jobParameters:
5654
testGroup: perf
5755

58-
# run arm64 interpreter jobs for mono
59-
- template: /eng/pipelines/common/platform-matrix.yml
60-
parameters:
61-
jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
62-
buildConfig: release
63-
runtimeFlavor: mono
64-
platforms:
65-
- Linux_arm64
66-
jobParameters:
67-
testGroup: perf
68-
liveLibrariesBuildConfig: Release
69-
runtimeType: mono
70-
codeGenType: 'Interpreter'
71-
projectFile: microbenchmarks.proj
72-
runKind: micro_mono
73-
runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml
74-
logicalmachine: 'perfa64'
75-
7656
# build mono on wasm
7757
- template: /eng/pipelines/common/platform-matrix.yml
7858
parameters:
@@ -124,9 +104,7 @@ jobs:
124104
- Linux_x64
125105
- windows_x64
126106
- windows_x86
127-
- Linux_arm64
128107
- Linux_musl_x64
129-
- windows_arm64
130108
jobParameters:
131109
testGroup: perf
132110

@@ -173,27 +151,6 @@ jobs:
173151
archiveType: tar
174152
tarCompression: gz
175153

176-
- template: /eng/pipelines/common/platform-matrix.yml
177-
parameters:
178-
jobTemplate: /eng/pipelines/common/global-build-job.yml
179-
buildConfig: release
180-
runtimeFlavor: mono
181-
platforms:
182-
- Linux_arm64
183-
jobParameters:
184-
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
185-
nameSuffix: AOT
186-
isOfficialBuild: false
187-
extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml
188-
extraStepsParameters:
189-
rootFolder: '$(Build.SourcesDirectory)/artifacts/'
190-
includeRootFolder: true
191-
displayName: AOT Mono Artifacts
192-
artifactName: LinuxMonoAOTarm64
193-
archiveExtension: '.tar.gz'
194-
archiveType: tar
195-
tarCompression: gz
196-
197154
# build mono Android scenarios
198155
- template: /eng/pipelines/common/platform-matrix.yml
199156
parameters:
@@ -342,7 +299,6 @@ jobs:
342299
runtimeFlavor: aot
343300
platforms:
344301
- Linux_x64
345-
- Linux_arm64
346302
jobParameters:
347303
testGroup: perf
348304
liveLibrariesBuildConfig: Release
@@ -438,38 +394,6 @@ jobs:
438394
runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml
439395
logicalmachine: 'perfowl'
440396

441-
# run coreclr Linux arm64 microbenchmarks perf job
442-
- template: /eng/pipelines/common/platform-matrix.yml
443-
parameters:
444-
jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
445-
buildConfig: release
446-
runtimeFlavor: coreclr
447-
platforms:
448-
- Linux_arm64
449-
jobParameters:
450-
testGroup: perf
451-
liveLibrariesBuildConfig: Release
452-
projectFile: microbenchmarks.proj
453-
runKind: micro
454-
runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml
455-
logicalmachine: 'perfa64'
456-
457-
# run coreclr Windows arm64 microbenchmarks perf job
458-
- template: /eng/pipelines/common/platform-matrix.yml
459-
parameters:
460-
jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
461-
buildConfig: release
462-
runtimeFlavor: coreclr
463-
platforms:
464-
- windows_arm64
465-
jobParameters:
466-
testGroup: perf
467-
liveLibrariesBuildConfig: Release
468-
projectFile: microbenchmarks.proj
469-
runKind: micro
470-
runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml
471-
logicalmachine: 'perfsurf'
472-
473397
# run coreclr crossgen perf job
474398
- template: /eng/pipelines/common/platform-matrix.yml
475399
parameters:

0 commit comments

Comments
 (0)