Skip to content

Commit caeac86

Browse files
333fredCyrusNajmabadiAlekseyTsjcouvJoeRobich
authored
Merge main to runtime async branch (#79582)
* Support interpolated string handlers in extension blocks (#78425) * Support interpolated string handlers in extension blocks Closes #78137. * A few tests fail PEVerify * Update handling of receivers in static scenarios and add tests for indexers/static methods * Update after merge * Ensure nullable index adjustment happens always, not just when the receiver parameter is used. * Additional il verification progress * PR feedback. The only remaining item is additional testing for ref safety to record the current state. * Additional PR feedback * More testing, suggested simplification * Simplify and more testing. * Feedback * Suggested optimization * Add skipped test for #78433. * Fix loss of nullability attributes when getting the 'constructed reduced from' method. (#79400) * Add tracking issue for disabled assert (#79427) Reference tracking issue #79426 for the disabled assert. * Fix code gen for some compound assignment scenarios involving extension properties. (#79339) * Extensions: extension marker type name (#79308) * Move to xunit.runner.visualstudio 3.1.3 * Avoid eliding pointer-to-ref conversions (#79311) * Avoid eliding pointer to ref conversions * Consider only user-defined locals * Update pre-existing tests * Test evaluation order * Explain user-defined local check * Avoid reusing temps whose refs might be captured (#76009) * Avoid reusing temps whose refs might be captured * Revert some changes * Simplify the heuristic * Avoid reusing any local whose address has been taken * Update tests * Inline a function * Revert unrelated change * Remove non-reusable locals after checking for them * Keep ref count for addressed locals list * Extend an assert * Add high-level comment to MightEscapeTemporaryRefs * Filter non-reusable locals * Simplify `int`s to `bool`s * Replace coalesce with an assert * Mark nested calls as always used * Fix this parameter of nint methods * Test chained call * Simplify by using this parameter symbol * Fix readonly targets * Fixup a test * Remove an unused parameter * Fix nullability after merge * [main] Update dependencies from dotnet/arcade (#79385) [main] Update dependencies from dotnet/arcade - Revert .NET SDK bump - Set NUGET_PACKAGES for bootstrap builds in CI - Set NUGET_PACKAGES for Correctness_Build_Artifacts - Add tracking issue for workarounds - Call nuget restore with the -publish flag - We need to restore where we publish - Add comment for strange restore behavior - Update comment * Fixes rename attribute bug (#79418) * fix bug * update test * simplify * comment * clarity * gracefully handle the document or languageservice being null * Adds EqualityComparer<T>.Create polyfill * Revert compiler changes * Update dependencies from https://github.com/dotnet/arcade build 20250717.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.25358.3 -> To Version 10.0.0-beta.25367.3 * Move to .NET 10p6 (#79438) * Move to .NET 10p6 Let's try to get ahead of the next one. * Update contributing docs as well. * Allow razor to use SolutionChecksumUpdater (#79373) * Allow razor to use SolutionChecksumUpdater SolutionChecksumUpdater allows incremental updates of sourcetexts in the server process, but was previously limited to just documents in the solution. Instead, by loosening this to allow TextDocuments, razor editing can have incremental updates of the primary razor document when cohosting is turned on. * use is/or instead of ==/|| * Remove dependency on ClassificationOptions and DefinitionItem from Semantic Search service (#79439) * Update insertions for VS release changes * Fix static extension method not showing up on enum type * Add workitem * cleanup * Use ConfigureAwait(true) when in a blocking JTF run call * GetTextSynchronously * Update src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.VsLanguageDebugInfo.cs Co-authored-by: Jason Malinowski <[email protected]> * Make synchronous * Docs * Allow Razor to create a formatting options, and send it to OOP * Update dependencies from https://github.com/dotnet/arcade build 20250717.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.25358.3 -> To Version 10.0.0-beta.25367.4 * Remove assumption about a tree shape that compound assignment produces (#79432) * Skip GetProjectXml_FileBasedProgram_SdkTooOld_01 test * Bump Microsoft.VisualStudio.Extensibility.Testing.Xunit to 0.1.796-beta This brings along some fixes needed for it to work under newer versions of xunit.runner.visualstudio. * Reduce path length of Roslyn ServiceHub Services folder (#79460) I've been hitting lots of gold bars in VS indicating various Roslyn features are unavailable when running when F5'ing the roslyn project. I finally spent some time digging into why this happens on my machine, and it turns out that out service hub service paths are just a bit too long. This PR just reduces that path length by 14 characters, which is enough for all the services to be under the 260 character long path limit. * downgrade SDK * Fix Typo * Simplify stale project handling (#79386) * Update System.Memory to prevent bootstrap failure * Include dependencies of System.Memory in VSIX deployment project * remove unnecessary additional reference * Update dependencies from https://github.com/dotnet/arcade build 20250717.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.25358.3 -> To Version 10.0.0-beta.25367.5 * Use new compiler API * Correctly change return type of partial definition part * Feedback * Move RoslynParallel and ProducerConsumer to threading source package (#79474) * Downgrade SDK * Do not remove usings/imports in code-cleanup when file has syntax errors * Add testws * Find add-using results in SG docs * Docs * Do not place SuppressMessage attributes on an extension block * remove asynchrony from service registration * Ignore all targets of MS.CA.Threading.Package in rebuild (#79495) * Don't mark special compiler synthesized members as obsolete * Add test * Use globs in .projitems for source packages (#79480) * Fix name declaration completion in primary constructor parameters * nrt * nrt * Generate complogs on build failure (#79446) * Generate complogs on build failure This should make it easier to reproduce CI compiler failures locally. * Test bad change for complog creation * Use --yes * Include full exception * Revert "Test bad change for complog creation" This reverts commit a465981. * remove from pkgdefs * Extensions: fix issue with GetParameterOrExtensionParameter (#79402) * Fix exception when requesting additional file diagnostics * Do not do full cleanup when we are formatting a new document The CodeAction.CleanupDocumentAsync was added in #59091 to ensure the document had elastic trivia formatted before we applied the result to the file. It appears the intent was to do just the trivia formatting, but the CleanupDocumentAsync does a lot of expensive operations around simplification and adding imports, which aren't needed in this case. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1540532 * Extensions: add test for function type scenario (#79323) * Reenable analyzer that was disabled when we moved to .Net 10 Preview 5 * Allow captured primary constructor parameters to be still used in base-list * Simplify ancestor checks * Fix 'this' keyword not being recomended where allowed * in progress * Fix 'switch' keyword recomendations after an expression * Fix escaping of enum members in completion * Suggest proper 'Async'-suffixed name for Task-returning symbols * Fix location of 'partial' modifier when generating new partial members * Update VMR orchestrator property (#79517) * Make attachdebugger flag work on non-Windows (#79499) These compiler flags used Debugger.Launch, which only works on windows. I borrowed the equivalent code from the LSP launcher, which already has this functionality (https://github.com/dotnet/roslyn/blob/cf34acbc5d0f64ff87013cdd02ae61cff562daaf/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs#L75-L89). * Downgrade System.Memory to make VS happy * Fix auth issue in PR val builds * Fix * Update Basic.Reference.Assemblies (#79525) * Update Basic.Reference.Assemblies Update to version 1.8.3 of Basic.Reference.Assemblies and make references to .NET 10p6 available in our tests. * Feedback * Feedback * Allow add using to work on Razor generated documents * Improve compiler server/client logging (#79335) * Remove unused constant * Include timestamp in logs * Log messages to msbuild as well * Log server's process ID * Log process creation on Unix * Exclude some messages from the binlog * Fix test loggers * Revert "Exclude some messages from the binlog" This reverts commit 12c1050. * Cleanup * Simplify * Simplify * Simplify * Add tests * Add tests * Simplify * Simplify * initial change * Renames * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Extensions: address or split remaining open issues directly associated with test plan (#79452) * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * Update tests * In progress * in progress * in progress * in progress * in progress * in progress * in progress * in progress * Cleanup split between lexer and sliding-text-window (#79205) Co-authored-by: Jan Jones <[email protected]> * Add docs * Fix name qualification when moving a using alias outside of a file scoped namespace * Fix strucutre out of bounds * Tests * Add Version.Details.props (#79539) * Fix issue with 'use explicit type' and nullable tuples * Add back * Convert ValueTaskFactory methods to static extensions (#79541) * Update logic * Also downgrade System.Numerics.Vectors for VS * Add Enum static extensions (#79546) * Fix main build break * Fix main build break AGAIN * Projects to deploy (#79430) * [main] Source code updates from dotnet/dotnet (#79483) [main] Source code updates from dotnet/dotnet - Workaround cref resolve issue due to new RuntimeHelpers in SCI * [main] Source code updates from dotnet/dotnet (#79563) [main] Source code updates from dotnet/dotnet * Revert "Fix main build break AGAIN (#79559)" This reverts commit e67e2a4, reversing changes made to 1a74e66. * Tweak build break fix * Tweak build break fix * inline test strings * Cleanup test methods * Fix issue where we weren't properly adding elastic trivia to newly generated members * Fix behavior * Add test * Mark SyntaxTokenParser as non-experimental (#79521) Co-authored-by: copilot-swe-agent[bot] <[email protected]> --------- Co-authored-by: Cyrus Najmabadi <[email protected]> Co-authored-by: AlekseyTs <[email protected]> Co-authored-by: Julien Couvreur <[email protected]> Co-authored-by: Joey Robichaud <[email protected]> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Joey Robichaud <[email protected]> Co-authored-by: Ankita Khera <[email protected]> Co-authored-by: tmat <[email protected]> Co-authored-by: Tomáš Matoušek <[email protected]> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Todd Grunke <[email protected]> Co-authored-by: David Barbet <[email protected]> Co-authored-by: Cyrus Najmabadi <[email protected]> Co-authored-by: Jason Malinowski <[email protected]> Co-authored-by: David Wengier <[email protected]> Co-authored-by: Jason Malinowski <[email protected]> Co-authored-by: DoctorKrolic <[email protected]> Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: Djuradj Kurepa <[email protected]> Co-authored-by: Copilot <[email protected]>
2 parents d5554f3 + a9c63d3 commit caeac86

File tree

839 files changed

+38146
-30745
lines changed

Some content is hidden

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

839 files changed

+38146
-30745
lines changed

azure-pipelines-pr-validation.yml

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,28 +165,6 @@ extends:
165165
displayName: Setting SourceBranchName variable
166166
condition: succeeded()
167167

168-
- task: Powershell@2
169-
name: FancyBuild
170-
displayName: Setting FancyBuild.BuildNumber
171-
inputs:
172-
targetType: inline
173-
script: |
174-
$pull_request = Invoke-RestMethod -Uri "https://api.github.com/repos/dotnet/roslyn/pulls/${{ parameters.PRNumber }}" `
175-
-Headers @{
176-
"Accept" = "application/vnd.github+json";
177-
"X-GitHub-Api-Version" = "2022-11-28"
178-
}
179-
$buildNumberName = "$(OriginalBuildNumber) - $($pull_request.user.login) - '$($pull_request.title)'"
180-
$buildNumberName = $buildNumberName -replace '["/:<>\|?@*]','_'
181-
# Maximum buildnumber length is 255 chars and we are going to append to the end to ensure we have space.
182-
if ($buildNumberName.Length -GT 253) {
183-
$buildNumberName = $buildNumberName.Substring(0, 253)
184-
}
185-
# Avoid ever ending the BuildNumber with a `.` by always appending to it.
186-
$buildNumberName += ' #'
187-
Write-Host "##vso[task.setvariable variable=BuildNumber;isoutput=true;isreadonly=true]$buildNumberName"
188-
Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
189-
190168
- task: Powershell@2
191169
displayName: Tag PR validation build
192170
inputs:
@@ -204,6 +182,25 @@ extends:
204182
arguments: "-sourceBranchName $(SourceBranchName) -prNumber ${{ parameters.PRNumber }} -commitSHA ${{ parameters.CommitSHA }} -enforceLatestCommit ${{ iif(parameters.EnforceLatestCommit, '1', '0') }}"
205183
condition: succeeded()
206184

185+
- task: Powershell@2
186+
name: FancyBuild
187+
displayName: Setting FancyBuild.BuildNumber
188+
inputs:
189+
targetType: inline
190+
script: |
191+
$authorName = git log -1 --pretty=format:"%an" ${{ parameters.CommitSHA }}
192+
193+
$buildNumberName = "$(OriginalBuildNumber) - $($authorName) - '${{ parameters.PRNumber }}'"
194+
$buildNumberName = $buildNumberName -replace '["/:<>\|?@*]','_'
195+
# Maximum buildnumber length is 255 chars and we are going to append to the end to ensure we have space.
196+
if ($buildNumberName.Length -GT 253) {
197+
$buildNumberName = $buildNumberName.Substring(0, 253)
198+
}
199+
# Avoid ever ending the BuildNumber with a `.` by always appending to it.
200+
$buildNumberName += ' #'
201+
Write-Host "##vso[task.setvariable variable=BuildNumber;isoutput=true;isreadonly=true]$buildNumberName"
202+
Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
203+
207204
- powershell: Write-Host "##vso[task.setvariable variable=VisualStudio.DropName]Products/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranchName)/$(OriginalBuildNumber)"
208205
displayName: Setting VisualStudio.DropName variable
209206

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/Publishing.props

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
<!--
1818
During PR Validation we only need to publish symbols with Arcade,
1919
since our packages are published separately to the CoreXT feed.
20+
21+
Also, do not publish any symbols packages in source-only builds.
2022
-->
2123
<Target Name="_ResolvePublishRoslynNuGetPackages"
2224
DependsOnTargets="BeforePublish"
2325
BeforeTargets="PublishToAzureDevOpsArtifacts"
24-
Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
26+
Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' or '$(DotNetBuildSourceOnly)' == 'true' ">
27+
2528
<ItemGroup>
2629
<!-- Determine all NuGet packages being published -->
2730
<_NuGetPackagesToPush Include="@(ItemsToPushToBlobFeed)"
@@ -30,13 +33,25 @@
3033
<!-- Determine all symbol packages being published -->
3134
<_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
3235
Condition="$([System.String]::Copy(%(FullPath)).EndsWith('.symbols.nupkg'))" />
36+
<_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
37+
Condition="$([System.String]::Copy(%(FullPath)).Contains('.Symbols.'))" />
38+
</ItemGroup>
3339

40+
<ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
3441
<!-- Remove all NuGet packages from being published -->
3542
<ItemsToPushToBlobFeed Remove="@(_NuGetPackagesToPush)" />
43+
</ItemGroup>
44+
45+
<ItemGroup Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
46+
<!-- Remove all symbols packages from being published -->
47+
<ItemsToPushToBlobFeed Remove="@(_SymbolPackagesToPush)" />
48+
</ItemGroup>
3649

37-
<!-- Include symbol packages for publishing -->
50+
<ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' and '$(DotNetBuildSourceOnly)' != 'true' ">
51+
<!-- Include symbol packages for publishing-->
3852
<ItemsToPushToBlobFeed Include="@(_SymbolPackagesToPush)" />
3953
</ItemGroup>
54+
4055
</Target>
4156

4257
</Project>

eng/Version.Details.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!-- will get filled in the next backflow -->

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="f451e5d3036a4f140a989e0a7f3f1ae432420e71" BarId="274568" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="c0e325f90fb79db0da6be5128dc292f2aabb264f" BarId="276450" />
44
<ProductDependencies>
55
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
66
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
77
<Uri>https://github.com/dotnet/roslyn</Uri>
88
<Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
99
</Dependency>
10-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
11-
<Uri>https://github.com/dotnet/command-line-api</Uri>
12-
<Sha>e9b0511d7f1128e2bc3be7a658a2a4ea977e602d</Sha>
10+
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25373.104">
11+
<Uri>https://github.com/dotnet/dotnet</Uri>
12+
<Sha>c0e325f90fb79db0da6be5128dc292f2aabb264f</Sha>
1313
</Dependency>
1414
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
1515
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">
@@ -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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
3434
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
35-
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
35+
<SystemBuffersVersion>4.6.0</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>
44-
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
41+
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
42+
<SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
43+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
44+
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
4545
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
4646
</PropertyGroup>
4747
<!--
4848
Versions managed by Arcade (see Versions.Details.xml)
4949
-->
5050
<PropertyGroup>
51-
<SystemCommandLineVersion>2.0.0-beta5.25210.1</SystemCommandLineVersion>
51+
<SystemCommandLineVersion>2.0.0-beta7.25373.104</SystemCommandLineVersion>
5252
<SystemCompositionVersion>9.0.0</SystemCompositionVersion>
5353
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
5454
<SystemDiagnosticsEventLogVersion>9.0.0</SystemDiagnosticsEventLogVersion>
@@ -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
<!--

0 commit comments

Comments
 (0)