Skip to content

Commit 8c2b431

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into darc-release/9.0.2xx-957ca2fa-9edb-4c0b-a130-d0f29ff1a09d
2 parents d5dcc88 + 8eb08d8 commit 8c2b431

File tree

5 files changed

+35
-9
lines changed

5 files changed

+35
-9
lines changed

‎.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
branches:
66
include:
77
- main
8-
- release/9.0.2xx
8+
- release/9.0.3xx
99
- internal/release/*
1010
- exp/*
1111

‎NuGet.config

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,20 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-deployment-tools -->
77
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-6/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-5/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
814
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
915
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-15/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-14/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-13/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-12/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-11/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-10/nuget/v3/index.json" />
1022
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-1/nuget/v3/index.json" />
1123
<!-- End: Package sources from dotnet-deployment-tools -->
1224
<!-- Begin: Package sources from dotnet-aspire -->
@@ -45,8 +57,20 @@
4557
<!-- End: Package sources from dotnet-runtime -->
4658
<!-- Begin: Package sources from dotnet-templating -->
4759
<add key="darc-pub-dotnet-templating-abf3646" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462/nuget/v3/index.json" />
60+
<add key="darc-pub-dotnet-templating-abf3646-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-9/nuget/v3/index.json" />
61+
<add key="darc-pub-dotnet-templating-abf3646-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-8/nuget/v3/index.json" />
62+
<add key="darc-pub-dotnet-templating-abf3646-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-7/nuget/v3/index.json" />
63+
<add key="darc-pub-dotnet-templating-abf3646-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-6/nuget/v3/index.json" />
64+
<add key="darc-pub-dotnet-templating-abf3646-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-5/nuget/v3/index.json" />
65+
<add key="darc-pub-dotnet-templating-abf3646-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-4/nuget/v3/index.json" />
4866
<add key="darc-pub-dotnet-templating-abf3646-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-3/nuget/v3/index.json" />
4967
<add key="darc-pub-dotnet-templating-abf3646-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-2/nuget/v3/index.json" />
68+
<add key="darc-pub-dotnet-templating-abf3646-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-15/nuget/v3/index.json" />
69+
<add key="darc-pub-dotnet-templating-abf3646-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-14/nuget/v3/index.json" />
70+
<add key="darc-pub-dotnet-templating-abf3646-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-13/nuget/v3/index.json" />
71+
<add key="darc-pub-dotnet-templating-abf3646-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-12/nuget/v3/index.json" />
72+
<add key="darc-pub-dotnet-templating-abf3646-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-11/nuget/v3/index.json" />
73+
<add key="darc-pub-dotnet-templating-abf3646-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-10/nuget/v3/index.json" />
5074
<add key="darc-pub-dotnet-templating-abf3646-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462-1/nuget/v3/index.json" />
5175
<!-- End: Package sources from dotnet-templating -->
5276
<!-- Begin: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25070.3">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25102.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>702695802459ffcd11d13cfb73f86aa7b9f6a3ea</Sha>
602+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25070.3">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25102.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>702695802459ffcd11d13cfb73f86aa7b9f6a3ea</Sha>
607+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>2</VersionSDKMinor>
9-
<VersionFeature>00</VersionFeature>
9+
<VersionFeature>01</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -259,7 +259,7 @@
259259
<PropertyGroup Label="Infrastructure and test only dependencies">
260260
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
261261
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
262-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25070.3</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
262+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25102.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Manually updated">
265265
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ 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
104-
string relativeSolutionFolder = Path.GetDirectoryName(relativePath);
103+
// Add fallback solution folder if relative path does not contain `..`.
104+
string relativeSolutionFolder = relativePath.Split(Path.DirectorySeparatorChar).Any(p => p == "..")
105+
? string.Empty : Path.GetDirectoryName(relativePath);
106+
105107
if (!_inRoot && solutionFolder is null && !string.IsNullOrEmpty(relativeSolutionFolder))
106108
{
107109
if (relativeSolutionFolder.Split(Path.DirectorySeparatorChar).LastOrDefault() == Path.GetFileNameWithoutExtension(relativePath))

0 commit comments

Comments
 (0)