Skip to content

Commit 2aa09da

Browse files
committed
Merge branch 'update-basic-reference-assemblies' into struct-lifting-tests
* update-basic-reference-assemblies: (99 commits) Feedback Feedback Update Basic.Reference.Assemblies Make attachdebugger flag work on non-Windows (dotnet#79499) Update VMR orchestrator property (dotnet#79517) Extensions: add test for function type scenario (dotnet#79323) Fix exception when requesting additional file diagnostics Extensions: fix issue with GetParameterOrExtensionParameter (dotnet#79402) remove from pkgdefs Generate complogs on build failure (dotnet#79446) nrt nrt Fix name declaration completion in primary constructor parameters Use globs in .projitems for source packages (dotnet#79480) Add test Don't mark special compiler synthesized members as obsolete Ignore all targets of MS.CA.Threading.Package in rebuild (dotnet#79495) remove asynchrony from service registration Do not place SuppressMessage attributes on an extension block Docs ...
2 parents c4e8111 + 258bae3 commit 2aa09da

File tree

363 files changed

+25977
-10973
lines changed

Some content is hidden

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

363 files changed

+25977
-10973
lines changed

azure-pipelines.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,19 @@ stages:
400400
configuration: Release
401401
- name: compilerChange
402402
value: $[dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange']]
403+
# Set NUGET_PACKAGES to fix issues with package Restore when building with `-ci`.
404+
# Workaround for https://github.com/dotnet/arcade/issues/15970
405+
- name: NUGET_PACKAGES
406+
value: $(Build.SourcesDirectory)\.packages
403407
steps:
404408
- template: eng/pipelines/checkout-windows-task.yml
405409

406410
- powershell: eng/build.ps1 -configuration Release -prepareMachine -ci -restore -binaryLogName Restore.binlog
407411
displayName: Restore
408412

409-
- powershell: eng/build.ps1 -configuration Release -prepareMachine -ci -build -pack -publish -sign -binaryLogName Build.binlog /p:DotnetPublishUsingPipelines=true /p:ContinuousIntegrationBuildCorrectness=true
413+
# We additionally restore during the build because the Microsoft.DotNet.Build.Tasks.Feed package only restores when we pass `-publish`. See https://github.com/dotnet/arcade/blob/37ccfd66358af6a37a0ec385ec31d1d71bdd8723/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj#L61-L66
414+
# Passing `-publish` during the restore step above fails due to no items needing published.
415+
- powershell: eng/build.ps1 -configuration Release -prepareMachine -ci -restore -build -pack -publish -sign -binaryLogName Build.binlog /p:DotnetPublishUsingPipelines=true /p:ContinuousIntegrationBuildCorrectness=true
410416
displayName: Build
411417

412418
# While this task is not executed in the official build, this serves as a PR check for whether symbol exclusions

docs/contributing/Building, Debugging, and Testing on Unix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Particularly for developers who aren't experienced with .NET Core development on
1212
1. Install [VS Code](https://code.visualstudio.com/Download)
1313
- After you install VS Code, install the [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
1414
- Important tip: You can look up editor commands by name by hitting *Ctrl+Shift+P*, or by hitting *Ctrl+P* and typing a `>` character. This will help you get familiar with editor commands mentioned below. On a Mac, use ** instead of *Ctrl*.
15-
1. Install the [.NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) which matches the `sdk.version` property in [global.json](../../global.json#L3)
15+
1. Install the [.NET 10.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) which matches the `sdk.version` property in [global.json](../../global.json#L3)
1616
3. You can build from VS Code by running the *Run Build Task* command, then selecting an appropriate task such as *build* or *build current project* (the latter builds the containing project for the current file you're viewing in the editor).
1717
4. You can run tests from VS Code by opening a test class in the editor, then using the *Run Tests in Context* and *Debug Tests in Context* editor commands. You may want to bind these commands to keyboard shortcuts that match their Visual Studio equivalents (**Ctrl+R, T** for *Run Tests in Context* and **Ctrl+R, Ctrl+T** for *Debug Tests in Context*).
1818
5. You can launch a new VS Code instance with the language server from your current code by running the "launch vscode with language server" task.

docs/contributing/Building, Debugging, and Testing on Windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The minimal required version of .NET Framework is 4.7.2.
2020
- Ensure C# and Visual Basic, MSBuild, and .NET Core are included in the selected individual components
2121
- Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
2222
- Restart Visual Studio
23-
1. Install the [.NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) which matches the `sdk.version` property in [global.json](../../global.json#L3)
23+
1. Install the [.NET 10.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) which matches the `sdk.version` property in [global.json](../../global.json#L3)
2424
1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading.
2525
1. Run Restore.cmd
2626
1. Open Roslyn.sln

docs/contributing/Compiler Test Plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ This document provides guidance for thinking about language interactions and tes
5555
- Compiler-recognized attributes should not have any effect in earlier LangVersions,
5656
except a LangVersion error should be reported when functionality depending on the attribute is used
5757
(for example, InlineArray conversion to Span).
58-
- Generics (type arguments, variance, constraints including `class`, `struct`, `new()`, `unmanaged`, `notnull`, types and interfaces with nullability)
58+
- Generics (type arguments, variance, constraints including `class`, `struct`, `new()`, `unmanaged`, `notnull`, `allows ref struct`, types and interfaces with nullability)
5959
- Default and constant values
6060
- Partial classes
6161
- Literals

eng/Directory.Packages.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<RoslynDiagnosticsNugetPackageVersion>3.11.0-beta1.24081.1</RoslynDiagnosticsNugetPackageVersion>
55
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23468.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
66
<MicrosoftCodeAnalysisTestingVersion>1.1.3-beta1.24319.1</MicrosoftCodeAnalysisTestingVersion>
7-
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.785-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
8-
<_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
7+
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.796-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
8+
<_BasicReferenceAssembliesVersion>1.8.3</_BasicReferenceAssembliesVersion>
99
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
1010
<CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
1111
<VisualStudioEditorPackagesVersion>17.13.226</VisualStudioEditorPackagesVersion>
@@ -273,7 +273,7 @@
273273
<PackageVersion Include="xunit.core" Version="$(_xunitVersion)" />
274274
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
275275
<PackageVersion Include="xunit.extensibility.core" Version="$(_xunitVersion)" />
276-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
276+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
277277
<PackageVersion Include="xunit.runner.utility" Version="$(_xunitVersion)" />
278278
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
279279
<PackageVersion Include="xunit.extensibility.execution" Version="$(_xunitVersion)" />
@@ -297,6 +297,7 @@
297297
<PackageVersion Include="Basic.Reference.Assemblies.Net461" Version="$(_BasicReferenceAssembliesVersion)" />
298298
<PackageVersion Include="Basic.Reference.Assemblies.NetStandard13" Version="$(_BasicReferenceAssembliesVersion)" />
299299
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="$(_BasicReferenceAssembliesVersion)" />
300+
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="$(_BasicReferenceAssembliesVersion)" />
300301
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
301302
<PackageVersion Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
302303
<!-- fix of vulnerability in 6.0.0 coming via Microsoft.TeamFoundationServer.Client -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@
110110
</Dependency>
111111
</ProductDependencies>
112112
<ToolsetDependencies>
113-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25259.2">
113+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25367.5">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>80c4e4d26cb85c86f7e1be77d2d9eceeef0f3493</Sha>
115+
<Sha>d777c20040bdc2e52b372fa98dcb84141ed692d3</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25259.2">
117+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25367.5">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>80c4e4d26cb85c86f7e1be77d2d9eceeef0f3493</Sha>
119+
<Sha>d777c20040bdc2e52b372fa98dcb84141ed692d3</Sha>
120120
</Dependency>
121121
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
122122
<Uri>https://github.com/dotnet/symreader</Uri>
@@ -126,9 +126,9 @@
126126
<Uri>https://github.com/dotnet/roslyn</Uri>
127127
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25259.2">
129+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25367.5">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>80c4e4d26cb85c86f7e1be77d2d9eceeef0f3493</Sha>
131+
<Sha>d777c20040bdc2e52b372fa98dcb84141ed692d3</Sha>
132132
</Dependency>
133133
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
134134
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
3434
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
35-
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
35+
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
3636
<!--
3737
Microsoft.TeamFoundationServer.Client is referencing System.Data.SqlClient causing CG alert
3838
When it updates its referenced System.Data.SqlClient version this should be removed
3939
-->
4040
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>
41-
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
42-
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
43-
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
41+
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
42+
<SystemNumericsVectorsVersion>4.6.1</SystemNumericsVectorsVersion>
43+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
4444
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
4545
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
4646
</PropertyGroup>
@@ -147,7 +147,7 @@
147147
<UsingToolXUnit>false</UsingToolXUnit>
148148
<UseVSTestRunner>true</UseVSTestRunner>
149149
<!-- Prohibit the usage of .NET Standard 1.x dependencies. -->
150-
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'">true</FlagNetStandard1XDependencies>
150+
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">true</FlagNetStandard1XDependencies>
151151
</PropertyGroup>
152152
<PropertyGroup>
153153
<!--

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ steps:
3030
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
3131
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
3232
useEsrpCli: true
33+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35+
${{ else }}:
36+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3337
env:
3438
TeamName: $(_TeamName)
3539
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
41-
baseRidArgs=
42-
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43-
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
44-
fi
45-
4641
portableBuildArgs=
4742
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
4843
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
5550
${{ parameters.platform.buildArguments }} \
5651
$internalRuntimeDownloadArgs \
5752
$targetRidArgs \
58-
$baseRidArgs \
5953
$portableBuildArgs \
6054
displayName: Build
6155

eng/common/dotnet.cmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
3+
:: This script is used to install the .NET SDK.
4+
:: It will also invoke the SDK with any provided arguments.
5+
6+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
7+
exit /b %ErrorLevel%

0 commit comments

Comments
 (0)