Skip to content

Commit 1f076fa

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into darc-release/9.0.2xx-93b19332-586d-4eca-80d0-ab7ae94e73b1
2 parents 1d6315e + efbe0f7 commit 1f076fa

File tree

8 files changed

+62
-22
lines changed

8 files changed

+62
-22
lines changed

‎NuGet.config

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,11 @@
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3535
<!-- Begin: Package sources from dotnet-runtime -->
36-
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-runtime-80aa709-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-15/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-runtime-80aa709-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-14/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-runtime-80aa709-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-12/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-runtime-80aa709-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-10/nuget/v3/index.json" />
4236
<!-- End: Package sources from dotnet-runtime -->
4337
<!-- Begin: Package sources from dotnet-templating -->
4438
<add key="darc-pub-dotnet-templating-a2862fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc/nuget/v3/index.json" />
4539
<add key="darc-pub-dotnet-templating-a2862fd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc-1/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-978233e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-978233e8/nuget/v3/index.json" />
4641
<!-- End: Package sources from dotnet-templating -->
4742
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4843
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -73,12 +68,6 @@
7368
<!-- Begin: Package sources from dotnet-aspnetcore -->
7469
<!-- End: Package sources from dotnet-aspnetcore -->
7570
<!-- Begin: Package sources from dotnet-runtime -->
76-
<add key="darc-int-dotnet-runtime-80aa709-10" value="true" />
77-
<add key="darc-int-dotnet-runtime-80aa709-12" value="true" />
78-
<add key="darc-int-dotnet-runtime-80aa709-14" value="true" />
79-
<add key="darc-int-dotnet-runtime-80aa709-15" value="true" />
80-
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
81-
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
8271
<!-- End: Package sources from dotnet-runtime -->
8372
<!-- Begin: Package sources from dotnet-windowsdesktop -->
8473
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.201">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.203">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
6+
<Sha>978233e8a25bfc3b2daa52005724ba470ca771bb</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.201-servicing.25112.5">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.203-servicing.25156.7">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
10+
<Sha>978233e8a25bfc3b2daa52005724ba470ca771bb</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.201-servicing.25112.5">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.203-servicing.25156.7">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
15+
<Sha>978233e8a25bfc3b2daa52005724ba470ca771bb</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2">

‎eng/Versions.props

Lines changed: 4 additions & 4 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>01</VersionFeature>
9+
<VersionFeature>03</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. -->
@@ -34,7 +34,7 @@
3434
<VersionFeature50>17</VersionFeature50>
3535
<VersionFeature60>36</VersionFeature60>
3636
<VersionFeature70>20</VersionFeature70>
37-
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature80>
37+
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature80>
3838
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
3939
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4040
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -185,13 +185,13 @@
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/templating -->
188-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.201</MicrosoftTemplateEngineAbstractionsPackageVersion>
188+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.203</MicrosoftTemplateEngineAbstractionsPackageVersion>
189189
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
190190
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
191191
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
192192
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
193193
<!-- test dependencies -->
194-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.201-servicing.25112.5</MicrosoftTemplateEngineMocksPackageVersion>
194+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.203-servicing.25156.7</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

‎test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.sln

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26006.2
5+
MinimumVisualStudioVersion = 10.0.40219.1

‎test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Dir/App.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<Solution />

‎test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Lib.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.4</TargetFramework>
5+
</PropertyGroup>
6+
7+
</Project>

‎test/TestAssets/TestProjects/TestAppWithSlnAndCsprojInParentDir/Lib/Library.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
6+
namespace Lib
7+
{
8+
public class Library
9+
{
10+
public static string GetMessage()
11+
{
12+
return "Message from Lib";
13+
}
14+
}
15+
}

‎test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,29 @@ public void WhenSolutionFolderIsPassedWithDirectorySeparatorFolderStructureIsCor
10961096
.Should().BeVisuallyEquivalentTo(expectedSlnContents);
10971097
}
10981098

1099+
[Theory]
1100+
[InlineData("sln", ".sln")]
1101+
[InlineData("sln", ".slnx")]
1102+
[InlineData("solution", ".sln")]
1103+
[InlineData("solution", ".slnx")]
1104+
public async Task WhenAddingProjectOutsideDirectoryItShouldNotAddSolutionFolders(string solutionCommand, string solutionExtension)
1105+
{
1106+
var projectDirectory = _testAssetsManager
1107+
.CopyTestAsset("TestAppWithSlnAndCsprojInParentDir", identifier: $"GivenDotnetSlnAdd-{solutionCommand}{solutionExtension}")
1108+
.WithSource()
1109+
.Path;
1110+
var projectToAdd = Path.Combine("..", "Lib", "Lib.csproj");
1111+
var cmd = new DotnetCommand(Log)
1112+
.WithWorkingDirectory(Path.Join(projectDirectory, "Dir"))
1113+
.Execute(solutionCommand, $"App{solutionExtension}", "add", projectToAdd);
1114+
cmd.Should().Pass();
1115+
// Should have no solution folders
1116+
ISolutionSerializer serializer = SolutionSerializers.GetSerializerByMoniker(Path.Join(projectDirectory, "Dir", $"App{solutionExtension}"));
1117+
SolutionModel solution = await serializer.OpenAsync(Path.Join(projectDirectory, "Dir", $"App{solutionExtension}"), CancellationToken.None);
1118+
solution.SolutionProjects.Count.Should().Be(1);
1119+
solution.SolutionFolders.Count.Should().Be(0);
1120+
}
1121+
10991122
private string GetExpectedSlnContents(
11001123
string slnPath,
11011124
string slnTemplateName,

0 commit comments

Comments
 (0)