Skip to content

Commit fd2639f

Browse files
authored
Removed PackageReference from copied settings. (#2365)
1 parent 7a8135b commit fd2639f

File tree

2 files changed

+1
-60
lines changed

2 files changed

+1
-60
lines changed

src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public class CsProjGenerator : DotNetCliGenerator, IEquatable<CsProjGenerator>
3434
"CopyLocalLockFileAssemblies",
3535
"PreserveCompilationContext",
3636
"UserSecretsId",
37-
"EnablePreviewFeatures",
38-
"PackageReference"
37+
"EnablePreviewFeatures"
3938
}.ToImmutableArray();
4039

4140
public string RuntimeFrameworkVersion { get; }

tests/BenchmarkDotNet.Tests/CsProjGeneratorTests.cs

-58
Original file line numberDiff line numberDiff line change
@@ -94,64 +94,6 @@ public void UseWpfSettingGetsCopied()
9494
Assert.Equal("Microsoft.NET.Sdk", sdkName);
9595
}
9696

97-
[Fact]
98-
public void PackageReferenceSingleLineGetsCopied()
99-
{
100-
const string WithPackageReference = @"
101-
<Project Sdk=""Microsoft.NET.Sdk"">
102-
<PropertyGroup>
103-
<PlatformTarget>AnyCPU</PlatformTarget>
104-
</PropertyGroup>
105-
106-
<ItemGroup>
107-
<PackageReference Include=""xunit"" Version=""2.4.2"" />
108-
</ItemGroup>
109-
</Project>
110-
";
111-
var sut = new CsProjGenerator("netcoreapp3.0", null, null, null, true);
112-
113-
var xmlDoc = new XmlDocument();
114-
xmlDoc.LoadXml(WithPackageReference);
115-
var (customProperties, sdkName) = sut.GetSettingsThatNeedToBeCopied(xmlDoc, TestAssemblyFileInfo);
116-
117-
AssertCustomProperties(@"<ItemGroup>
118-
<PackageReference Include=""xunit"" Version=""2.4.2"" />
119-
</ItemGroup>", customProperties);
120-
Assert.Equal("Microsoft.NET.Sdk", sdkName);
121-
}
122-
123-
[Fact]
124-
public void PackageReferenceMultiLineGetsCopied()
125-
{
126-
const string WithPackageReference = @"
127-
<Project Sdk=""Microsoft.NET.Sdk"">
128-
<PropertyGroup>
129-
<PlatformTarget>AnyCPU</PlatformTarget>
130-
</PropertyGroup>
131-
132-
<ItemGroup>
133-
<PackageReference Include=""xunit.runner.visualstudio"" Version=""2.4.5"">
134-
<PrivateAssets>all</PrivateAssets>
135-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
136-
</PackageReference>
137-
</ItemGroup>
138-
</Project>
139-
";
140-
var sut = new CsProjGenerator("netcoreapp3.0", null, null, null, true);
141-
142-
var xmlDoc = new XmlDocument();
143-
xmlDoc.LoadXml(WithPackageReference);
144-
var (customProperties, sdkName) = sut.GetSettingsThatNeedToBeCopied(xmlDoc, TestAssemblyFileInfo);
145-
146-
AssertCustomProperties(@"<ItemGroup>
147-
<PackageReference Include=""xunit.runner.visualstudio"" Version=""2.4.5"">
148-
<PrivateAssets>all</PrivateAssets>
149-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
150-
</PackageReference>
151-
</ItemGroup>", customProperties);
152-
Assert.Equal("Microsoft.NET.Sdk", sdkName);
153-
}
154-
15597
[Fact]
15698
public void SettingsFromPropsFileImportedUsingAbsolutePathGetCopies()
15799
{

0 commit comments

Comments
 (0)