Skip to content

Commit e45ca17

Browse files
nagilsonnagilson
authored
Merge branch 'main' into darc-main-6a483e62-9a15-475d-a31b-7c7d1c96cb9f
2 parents 849612e + 0e185be commit e45ca17

File tree

5 files changed

+78
-59
lines changed

5 files changed

+78
-59
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25264.3",
6+
"version": "1.1.0-beta.25271.3",
77
"commands": [
88
"darc"
99
]

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -117,74 +117,74 @@
117117
<Uri>https://github.com/dotnet/dotnet</Uri>
118118
<Sha>d60c3fe894af16cd15dc86420af0fc9d02be4997</Sha>
119119
</Dependency>
120-
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.57">
120+
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.60">
121121
<Uri>https://github.com/nuget/nuget.client</Uri>
122-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
122+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
123123
</Dependency>
124-
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.57">
124+
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.60">
125125
<Uri>https://github.com/nuget/nuget.client</Uri>
126-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
126+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
127127
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
128128
</Dependency>
129-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.57">
129+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.60">
130130
<Uri>https://github.com/nuget/nuget.client</Uri>
131-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
131+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
132132
</Dependency>
133-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.57">
133+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.60">
134134
<Uri>https://github.com/nuget/nuget.client</Uri>
135-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
135+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
136136
</Dependency>
137-
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.57">
137+
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.60">
138138
<Uri>https://github.com/nuget/nuget.client</Uri>
139-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
139+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
140140
</Dependency>
141-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.57">
141+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.60">
142142
<Uri>https://github.com/nuget/nuget.client</Uri>
143-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
143+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
144144
</Dependency>
145-
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.57">
145+
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.60">
146146
<Uri>https://github.com/nuget/nuget.client</Uri>
147-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
147+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
148148
</Dependency>
149-
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.57">
149+
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.60">
150150
<Uri>https://github.com/nuget/nuget.client</Uri>
151-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
151+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
152152
</Dependency>
153-
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.57">
153+
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.60">
154154
<Uri>https://github.com/nuget/nuget.client</Uri>
155-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
155+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
156156
</Dependency>
157-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.57">
157+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.60">
158158
<Uri>https://github.com/nuget/nuget.client</Uri>
159-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
159+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
160160
</Dependency>
161-
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.57">
161+
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.60">
162162
<Uri>https://github.com/nuget/nuget.client</Uri>
163-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
163+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
164164
</Dependency>
165-
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.57">
165+
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.60">
166166
<Uri>https://github.com/nuget/nuget.client</Uri>
167-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
167+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
168168
</Dependency>
169-
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.57">
169+
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.60">
170170
<Uri>https://github.com/nuget/nuget.client</Uri>
171-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
171+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
172172
</Dependency>
173-
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.57">
173+
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.60">
174174
<Uri>https://github.com/nuget/nuget.client</Uri>
175-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
175+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
176176
</Dependency>
177-
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.57">
177+
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.60">
178178
<Uri>https://github.com/nuget/nuget.client</Uri>
179-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
179+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
180180
</Dependency>
181-
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.57">
181+
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.60">
182182
<Uri>https://github.com/nuget/nuget.client</Uri>
183-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
183+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
184184
</Dependency>
185-
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.57">
185+
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.60">
186186
<Uri>https://github.com/nuget/nuget.client</Uri>
187-
<Sha>3fc7701c69ef4f8f096ba882736c18630f657e33</Sha>
187+
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.15.0-preview-25269-109">
190190
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -538,13 +538,13 @@
538538
<Uri>https://github.com/dotnet/dotnet</Uri>
539539
<Sha>d60c3fe894af16cd15dc86420af0fc9d02be4997</Sha>
540540
</Dependency>
541-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25264.3">
541+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25271.3">
542542
<Uri>https://github.com/dotnet/arcade-services</Uri>
543-
<Sha>7126d7cb6f801691b0dfcc4e8357471f8dc750a9</Sha>
543+
<Sha>5d2b9c17bf40f12fb843f329cd60d68105e73389</Sha>
544544
</Dependency>
545-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25264.3">
545+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25271.3">
546546
<Uri>https://github.com/dotnet/arcade-services</Uri>
547-
<Sha>7126d7cb6f801691b0dfcc4e8357471f8dc750a9</Sha>
547+
<Sha>5d2b9c17bf40f12fb843f329cd60d68105e73389</Sha>
548548
</Dependency>
549549
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25266.2">
550550
<Uri>https://github.com/microsoft/testfx</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
2323
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
2424
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
25-
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">5</PreReleaseVersionIteration>
25+
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">6</PreReleaseVersionIteration>
2626
<!-- In source-build the version of the compiler must be same or newer than the version of the
2727
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
2828
in that build mode analyzer assemblies always target the live compiler API. -->
@@ -39,8 +39,8 @@
3939
<VersionFeature60>36</VersionFeature60>
4040
<VersionFeature70>20</VersionFeature70>
4141
<!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
42-
<VersionFeature80>14</VersionFeature80>
43-
<VersionFeature90>3</VersionFeature90>
42+
<VersionFeature80>15</VersionFeature80>
43+
<VersionFeature90>4</VersionFeature90>
4444
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4545
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4646
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependency from https://github.com/dotnet/arcade-services -->
92-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25264.3</MicrosoftDotNetDarcLibVersion>
92+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25271.3</MicrosoftDotNetDarcLibVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -155,18 +155,18 @@
155155
</PropertyGroup>
156156
<PropertyGroup>
157157
<!-- Dependencies from https://github.com/nuget/nuget.client -->
158-
<NuGetBuildTasksPackageVersion>6.15.0-preview.1.57</NuGetBuildTasksPackageVersion>
159-
<NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.57</NuGetBuildTasksConsolePackageVersion>
160-
<NuGetLocalizationPackageVersion>6.15.0-preview.1.57</NuGetLocalizationPackageVersion>
161-
<NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.57</NuGetBuildTasksPackPackageVersion>
162-
<NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.57</NuGetCommandLineXPlatPackageVersion>
163-
<NuGetProjectModelPackageVersion>6.15.0-preview.1.57</NuGetProjectModelPackageVersion>
164-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.57</MicrosoftBuildNuGetSdkResolverPackageVersion>
165-
<NuGetCommonPackageVersion>6.15.0-preview.1.57</NuGetCommonPackageVersion>
166-
<NuGetConfigurationPackageVersion>6.15.0-preview.1.57</NuGetConfigurationPackageVersion>
167-
<NuGetFrameworksPackageVersion>6.15.0-preview.1.57</NuGetFrameworksPackageVersion>
168-
<NuGetPackagingPackageVersion>6.15.0-preview.1.57</NuGetPackagingPackageVersion>
169-
<NuGetVersioningPackageVersion>6.15.0-preview.1.57</NuGetVersioningPackageVersion>
158+
<NuGetBuildTasksPackageVersion>6.15.0-preview.1.60</NuGetBuildTasksPackageVersion>
159+
<NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.60</NuGetBuildTasksConsolePackageVersion>
160+
<NuGetLocalizationPackageVersion>6.15.0-preview.1.60</NuGetLocalizationPackageVersion>
161+
<NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.60</NuGetBuildTasksPackPackageVersion>
162+
<NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.60</NuGetCommandLineXPlatPackageVersion>
163+
<NuGetProjectModelPackageVersion>6.15.0-preview.1.60</NuGetProjectModelPackageVersion>
164+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.60</MicrosoftBuildNuGetSdkResolverPackageVersion>
165+
<NuGetCommonPackageVersion>6.15.0-preview.1.60</NuGetCommonPackageVersion>
166+
<NuGetConfigurationPackageVersion>6.15.0-preview.1.60</NuGetConfigurationPackageVersion>
167+
<NuGetFrameworksPackageVersion>6.15.0-preview.1.60</NuGetFrameworksPackageVersion>
168+
<NuGetPackagingPackageVersion>6.15.0-preview.1.60</NuGetPackagingPackageVersion>
169+
<NuGetVersioningPackageVersion>6.15.0-preview.1.60</NuGetVersioningPackageVersion>
170170
</PropertyGroup>
171171
<PropertyGroup>
172172
<!-- Dependencies from https://github.com/Microsoft/vstest -->

‎src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ private ModifiableRuntimeLibrary GetProjectRuntimeLibrary()
518518

519519
return new ModifiableRuntimeLibrary(new RuntimeLibrary(
520520
type: "project",
521-
name: _mainProjectInfo.Name,
521+
name: GetUniqueLibraryName(_mainProjectInfo.Name, "Project"),
522522
version: _mainProjectInfo.Version,
523523
hash: string.Empty,
524524
runtimeAssemblyGroups: runtimeAssemblyGroups,
@@ -918,7 +918,7 @@ private string GetReferenceLibraryName(ReferenceInfo reference)
918918
{
919919
// Reference names can conflict with PackageReference names, so
920920
// ensure that the Reference names are unique when creating libraries
921-
name = GetUniqueReferenceName(reference.Name);
921+
name = GetUniqueLibraryName(reference.Name);
922922

923923
ReferenceLibraryNames.Add(reference, name);
924924
_usedLibraryNames.Add(name);
@@ -927,11 +927,11 @@ private string GetReferenceLibraryName(ReferenceInfo reference)
927927
return name;
928928
}
929929

930-
private string GetUniqueReferenceName(string name)
930+
private string GetUniqueLibraryName(string name, string qualifier = "Reference")
931931
{
932932
if (_usedLibraryNames.Contains(name))
933933
{
934-
string startingName = $"{name}.Reference";
934+
string startingName = $"{name}.{qualifier}";
935935
name = startingName;
936936

937937
int suffix = 1;

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#nullable disable
55

6+
using System.Security.Cryptography;
67
using Microsoft.Build.Utilities;
78
using Microsoft.Extensions.DependencyModel;
89

@@ -156,6 +157,24 @@ public void PackageWithoutAssets_ShouldNotShowUpInDepsJson()
156157
}
157158
}
158159

160+
[Fact]
161+
public void ProjectNameCanMatchPackageReferenceName()
162+
{
163+
var testProject = new TestProject()
164+
{
165+
Name = "Newtonsoft.Json",
166+
TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
167+
};
168+
169+
testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", ToolsetInfo.GetNewtonsoftJsonPackageVersion()));
170+
testProject.AdditionalProperties["PackageId"] = "Newtonsoft.Json*";
171+
172+
var testAsset = _testAssetsManager.CreateTestProject(testProject);
173+
174+
var buildCommand = new BuildCommand(testAsset);
175+
buildCommand.Execute().Should().Pass();
176+
}
177+
159178
[WindowsOnlyFact]
160179
public void It_can_reference_a_netstandard2_library_and_exchange_types()
161180
{

0 commit comments

Comments
 (0)