Skip to content

Commit e701f14

Browse files
committed
Respond to PR feedback:
- Added comment for NoWarn - Change how Packages.props is imported - Change how analyzers are imported - fix sdks build - remove fullframework true
1 parent 909ece8 commit e701f14

File tree

8 files changed

+104
-105
lines changed

8 files changed

+104
-105
lines changed

Directory.Build.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
<!-- Source build does not need to worry about running on VS for Mac -->
2121
<ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
2222

23-
<!-- Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
23+
<!-- NU1701 Disable implicit package target fallback, and disable warning for when we explicitly add it (currently needed for
2424
Microsoft.ApplicationInsights) -->
25+
<!-- NU1507 Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
2526
<NoWarn>$(NoWarn);NU1701;NU1507</NoWarn>
2627
<!-- Temporarily NoWarn to avoid regression in preview 1.
2728
https://github.com/dotnet/roslyn-analyzers/pull/6236/files -->

Directory.Build.targets

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4-
<Import Project="$(RepositoryEngineeringDir)Packages.props" />
54
<ItemGroup>
65
<SupportedPlatform Remove="Android" />
76
<SupportedPlatform Remove="iOS" />

Directory.Packages.props

+94-95
Large diffs are not rendered by default.

eng/Analyzers.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
3-
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" PrivateAssets="all" Condition="'$(EnableStyleCopAnalyzer)' == 'true'" />
3+
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Condition="'$(EnableStyleCopAnalyzer)' == 'true'" />
44
</ItemGroup>
55
</Project>

eng/dependabot/Packages.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
<ItemGroup>
66
<!--Test dependencies-->
7-
<PackageVersion Update="Verify.Xunit" Version="20.4.0" />
8-
<PackageVersion Update="Verify.DiffPlex" Version="2.2.1" />
9-
<PackageVersion Update="FakeItEasy" Version="7.4.0" />
10-
<PackageVersion Update="Wcwidth.Sources" Version="1.0.0" />
7+
<PackageVersion Include="Verify.Xunit" Version="20.4.0" />
8+
<PackageVersion Include="Verify.DiffPlex" Version="2.2.1" />
9+
<PackageVersion Include="FakeItEasy" Version="7.4.0" />
10+
<PackageVersion Include="Wcwidth.Sources" Version="1.0.0" />
1111
</ItemGroup>
1212
</Project>

src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- While in prerelease, ship the symbols to everyone all the time. -->
1919
<DebugType>embedded</DebugType>
2020
<Nullable>enable</Nullable>
21-
<NoWarn>($NoWarn);CS8002;NU1507</NoWarn>
21+
<NoWarn>$(NoWarn);CS8002</NoWarn>
2222
<StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
2323
<SignAssembly>true</SignAssembly>
2424
</PropertyGroup>

src/Layout/redist/targets/sdks/sdks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="$(DependencyPackageName)" Version="$(DependencyPackageVersion)" />
12+
<PackageReference Include="$(DependencyPackageName)" VersionOverride="$(DependencyPackageVersion)" />
1313
</ItemGroup>
1414

1515
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/Tests/Microsoft.NET.TestFramework/TestCommandLine.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class TestCommandLine
99
{
1010
public List<string> RemainingArgs { get; private set; }
1111

12-
public bool UseFullFrameworkMSBuild { get; private set; } = true;
12+
public bool UseFullFrameworkMSBuild { get; private set; }
1313

1414
public string FullFrameworkMSBuildPath { get; private set; }
1515

0 commit comments

Comments
 (0)