Skip to content

Commit fab0e9e

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-release/9.0.3xx
2 parents d5adcbe + c9bcb6d commit fab0e9e

File tree

5 files changed

+51
-60
lines changed

5 files changed

+51
-60
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
3838
<add key="darc-pub-dotnet-templating-8fec3e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8fec3e94/nuget/v3/index.json" />
39-
<add key="darc-pub-dotnet-templating-bb74178" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780/nuget/v3/index.json" />
40-
<add key="darc-pub-dotnet-templating-bb74178-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-8/nuget/v3/index.json" />
41-
<add key="darc-pub-dotnet-templating-bb74178-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-7/nuget/v3/index.json" />
42-
<add key="darc-pub-dotnet-templating-bb74178-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-6/nuget/v3/index.json" />
43-
<add key="darc-pub-dotnet-templating-bb74178-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-5/nuget/v3/index.json" />
44-
<add key="darc-pub-dotnet-templating-bb74178-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-4/nuget/v3/index.json" />
45-
<add key="darc-pub-dotnet-templating-bb74178-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-3/nuget/v3/index.json" />
46-
<add key="darc-pub-dotnet-templating-bb74178-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-2/nuget/v3/index.json" />
47-
<add key="darc-pub-dotnet-templating-bb74178-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-1/nuget/v3/index.json" />
4839
<!-- End: Package sources from dotnet-templating -->
4940
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5041
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,43 @@
9393
<Sha>c1ce3cebbbf5e46205dd5c60a0d379a412703eae</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25229.6">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25262.10">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
98+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25229.6">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25262.10">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
103+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25229.6">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25262.10">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
108+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25229.6">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25262.10">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
112+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25229.6">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25262.10">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
116+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25229.6">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25262.10">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
120+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25229.6">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25262.10">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
124+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25229.6">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25262.10">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
128+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25229.6">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25262.10">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
132+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.4-servicing.25164.3">
135135
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -378,9 +378,9 @@
378378
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
379379
<Sha>433fa3e4a54010fcac6e8843460e29d33ba07eb7</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25229.6">
381+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0-3.25262.10">
382382
<Uri>https://github.com/dotnet/roslyn</Uri>
383-
<Sha>871ef6369443071681de3351d30f41ea78ab48e6</Sha>
383+
<Sha>8edf7bcd4f1594c3d68a6a567469f41dbd33dd1b</Sha>
384384
</Dependency>
385385
<!-- Intermediate is necessary for source build. -->
386386
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="9.0.0-preview.25202.1">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25263.2">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
560+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25255.5">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25263.2">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
564+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25255.5">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25263.2">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
568+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25255.5">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25263.2">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
572+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25255.5">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25263.2">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
576+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25255.5">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25263.2">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
580+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25255.5">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25263.2">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
585+
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.4">

‎eng/Versions.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<PropertyGroup>
162162
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
163163
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25202.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
164-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25229.6</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
164+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
165165
</PropertyGroup>
166166
<PropertyGroup>
167167
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -206,14 +206,14 @@
206206
</PropertyGroup>
207207
<PropertyGroup>
208208
<!-- Dependencies from https://github.com/dotnet/roslyn -->
209-
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25229.6</MicrosoftNetCompilersToolsetVersion>
210-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25229.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
211-
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25229.6</MicrosoftCodeAnalysisPackageVersion>
212-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25229.6</MicrosoftCodeAnalysisCSharpPackageVersion>
213-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25229.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
214-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25229.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
215-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25229.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
216-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25229.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
209+
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25262.10</MicrosoftNetCompilersToolsetVersion>
210+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25262.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
211+
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisPackageVersion>
212+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisCSharpPackageVersion>
213+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
214+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
215+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25262.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
217217
</PropertyGroup>
218218
<PropertyGroup>
219219
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25255.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25255.5</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25255.5</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25255.5</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25263.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25263.2</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25263.2</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25263.2</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25263.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Cli/dotnet/commands/dotnet-sln/add/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ private async Task AddProjectsToSolutionAsync(string solutionFileFullPath, IEnum
100100
foreach (var projectPath in projectPaths)
101101
{
102102
string relativePath = Path.GetRelativePath(Path.GetDirectoryName(solutionFileFullPath), projectPath);
103-
// Add fallback solution folder if relative path does not contain `..`.
104-
string relativeSolutionFolder = relativePath.Split(Path.DirectorySeparatorChar).Any(p => p == "..")
103+
// Add auto-generated solution folder if relative path exists in the solution directory
104+
string relativeSolutionFolder = (relativePath.Split(Path.DirectorySeparatorChar).Any(p => p == "..") || Path.IsPathRooted(relativePath))
105105
? string.Empty : Path.GetDirectoryName(relativePath);
106106

107107
if (!_inRoot && solutionFolder is null && !string.IsNullOrEmpty(relativeSolutionFolder))

0 commit comments

Comments
 (0)