Skip to content

Fix CodeAnalysis.ruleset path #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 1 commit into from
Nov 14, 2019
Merged

Fix CodeAnalysis.ruleset path #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

<DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir>
<ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'installer', 'manpages'))</ManPagesDir>
<CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
</PropertyGroup>

<!-- Packaging properties -->
Expand Down
19 changes: 8 additions & 11 deletions src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@
<PropertyGroup>
<CommonPath>$(MSBuildThisFileDirectory)Common</CommonPath>
<BclSourcesRoot>$(MSBuildThisFileDirectory)src</BclSourcesRoot>
<!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
<SharedBclSourcesRoot Condition="'$(IsRuntimeRepository)' != 'true'">$(MSBuildThisFileDirectory)shared</SharedBclSourcesRoot>
<SharedBclSourcesRoot Condition="'$(IsRuntimeRepository)' == 'true'">$(RepoRoot)src\libraries\System.Private.CoreLib\src</SharedBclSourcesRoot>
</PropertyGroup>

<!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
Expand Down Expand Up @@ -292,11 +289,11 @@
<Compile Include="$(BclSourcesRoot)\System\ValueType.cs" />
<Compile Include="$(BclSourcesRoot)\System\WeakReference.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\WeakReference.T.CoreCLR.cs" />
<Compile Include="$(SharedBclSourcesRoot)\Interop\Windows\Kernel32\Interop.GetStdHandle.cs" />
<Compile Include="$(SharedBclSourcesRoot)\Interop\Windows\Kernel32\Interop.HandleTypes.cs" />
<Compile Include="$(SharedBclSourcesRoot)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs" />
<Compile Include="$(SharedBclSourcesRoot)\Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs" />
<Compile Include="$(SharedBclSourcesRoot)\Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.GetStdHandle.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.HandleTypes.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.LocalAlloc.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs" />
</ItemGroup>
<ItemGroup Condition="'$(FeatureUtf8String)' == 'true'">
<Compile Include="$(BclSourcesRoot)\System\Char8.cs" />
Expand Down Expand Up @@ -391,7 +388,7 @@
<Compile Include="$(BclSourcesRoot)\System\Variant.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Compile Include="$(SharedBclSourcesRoot)\Interop\Windows\Interop.BOOL.cs" /> <!-- The CLR internally uses a BOOL type analogous to the Windows BOOL type on Unix -->
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.BOOL.cs" /> <!-- The CLR internally uses a BOOL type analogous to the Windows BOOL type on Unix -->
<Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
<Compile Include="$(BclSourcesRoot)\System\DateTime.Unix.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Unix.cs" />
Expand All @@ -416,7 +413,7 @@
<Compile Include="$(CommonPath)\NotImplemented.cs" />
<Compile Include="$(CommonPath)\System\SR.cs" />
</ItemGroup>
<Import Project="$(SharedBclSourcesRoot)\System.Private.CoreLib.Shared.projitems" />
<Import Project="$(CoreLibSharedDir)System.Private.CoreLib.Shared.projitems" />
<PropertyGroup>
<CheckCDefines Condition="'$(CheckCDefines)'==''">true</CheckCDefines>
</PropertyGroup>
Expand Down Expand Up @@ -449,7 +446,7 @@

<!-- Analyzers -->
<PropertyGroup>
<CodeAnalysisRuleset>$(SharedBclSourcesRoot)\CodeAnalysis.ruleset</CodeAnalysisRuleset>
<CodeAnalysisRuleset>$(CoreLibSharedDir)CodeAnalysis.ruleset</CodeAnalysisRuleset>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<PropertyGroup Condition="'$(CoreCLROverridePath)' != ''">
<_runtimeDirectory>$(CoreCLROverridePath)</_runtimeDirectory>
<_crossgenPath>$(CoreCLROverridePath)/crossgen$(ApplicationFileExtension)</_crossgenPath>
<_coreLibDirectory>$(CoreCLROverridePath)</_coreLibDirectory>
<_CoreLibSharedDirectory>$(CoreCLROverridePath)</_CoreLibSharedDirectory>
<_jitPath>$(CoreClrOverridePath)/$(_crossHostArch)/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
</PropertyGroup>

Expand Down
22 changes: 11 additions & 11 deletions src/libraries/Common/tests/Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@
<Compile Include="$(CommonPath)\System\Text\SimpleRegex.cs">
<Link>Common\System\Text\SimpleRegex.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)System\Text\ValueStringBuilder.cs">
<Compile Include="$(CoreLibSharedDir)System\Text\ValueStringBuilder.cs">
<Link>System\Text\ValueStringBuilder.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Security\IdentityHelper.cs">
<Link>Common\System\Security\IdentityHelper.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)System\PasteArguments.cs">
<Compile Include="$(CoreLibSharedDir)System\PasteArguments.cs">
<Link>System\PasteArguments.cs</Link>
</Compile>
<Compile Include="Tests\Interop\cgroupsTests.cs" />
Expand Down Expand Up @@ -139,47 +139,47 @@
</Compile>
<Compile Include="Tests\System\Net\VirtualNetworkTest.cs" />
<Compile Include="Tests\System\Net\VirtualNetworkStreamTest.cs" />
<Compile Include="$(CoreLibDir)System\Threading\Tasks\TaskToApm.cs">
<Compile Include="$(CoreLibSharedDir)System\Threading\Tasks\TaskToApm.cs">
<Link>System\Threading\Tasks\TaskToApm.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)System\IO\PathInternal.cs">
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.cs">
<Link>System\IO\PathInternal.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)'=='true'">
<Compile Include="$(CoreLibDir)System\IO\PathInternal.Windows.cs">
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Windows.cs">
<Link>System\IO\PathInternal.Windows.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="Tests\System\IO\PathInternal.Windows.Tests.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
<Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
<Link>Common\Interop\Windows\Interop.Errors.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)System\IO\Win32Marshal.cs">
<Compile Include="$(CoreLibSharedDir)System\IO\Win32Marshal.cs">
<Link>System\IO\Win32Marshal.cs</Link>
</Compile>
<Compile Include="Tests\System\IO\Win32Marshal.Tests.cs" />
<Compile Include="$(CoreLibDir)System\PasteArguments.Windows.cs">
<Compile Include="$(CoreLibSharedDir)System\PasteArguments.Windows.cs">
<Link>System\PasteArguments.Windows.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)'=='true'">
<Compile Include="Tests\System\IO\PathInternal.Unix.Tests.cs" />
<Compile Include="$(CoreLibDir)System\IO\PathInternal.Unix.cs">
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Unix.cs">
<Link>System\IO\PathInternal.Unix.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)Interop\Unix\System.Native\Interop.PathConf.cs">
<Compile Include="$(CoreLibSharedDir)Interop\Unix\System.Native\Interop.PathConf.cs">
<Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)System\PasteArguments.Unix.cs">
<Compile Include="$(CoreLibSharedDir)System\PasteArguments.Unix.cs">
<Link>System\PasteArguments.Unix.cs</Link>
</Compile>
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>
<!-- Windows imports -->
<ItemGroup>
<Compile Include="$(CoreLibDir)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
<Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RTL_OSVERSIONINFOEX.cs">
Expand All @@ -47,7 +47,7 @@
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
<Link>Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
Expand All @@ -59,7 +59,7 @@
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
<Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)Interop\Windows\Interop.BOOL.cs">
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.BOOL.cs">
<Link>Interop\Windows\Interop.BOOL.cs</Link>
</Compile>
</ItemGroup>
Expand All @@ -68,7 +68,7 @@
<Compile Include="$(CommonPath)\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
<Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs</Link>
</Compile>
<Compile Include="$(CoreLibDir)Interop\Unix\System.Native\Interop.GetEUid.cs">
<Compile Include="$(CoreLibSharedDir)Interop\Unix\System.Native\Interop.GetEUid.cs">
<Link>Common\Interop\Unix\Interop.GetEUid.cs</Link>
</Compile>
</ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions src/libraries/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,6 @@
<PropertyGroup>
<CommonPath>$(LibrariesProjectRoot)Common\src</CommonPath>
<CommonTestPath>$(LibrariesProjectRoot)Common\tests</CommonTestPath>

<CoreLibDir Condition="'$(IsRuntimeRepository)' != 'true'">$([MSBuild]::NormalizeDirectory('$(CommonPath)', 'CoreLib'))</CoreLibDir>
<CoreLibDir Condition="'$(IsRuntimeRepository)' == 'true'">$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibDir>
</PropertyGroup>

<!-- Set up the default output and intermediate paths -->
Expand Down Expand Up @@ -368,7 +365,7 @@
<!-- Workaround for https://github.com/microsoft/msbuild/issues/4474 -->
<GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>

<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Common\src\CoreLib\CodeAnalysis.ruleset</CodeAnalysisRuleset>
<CodeAnalysisRuleset>$(CoreLibSharedDir)CodeAnalysis.ruleset</CodeAnalysisRuleset>
<EnablePinvokeUWPAnalyzer>false</EnablePinvokeUWPAnalyzer>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<DefineConstants>$(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CoreLibDir)System\Diagnostics\CodeAnalysis\NullableAttributes.cs" Link="System\Diagnostics\CodeAnalysis\NullableAttributes.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\NullableAttributes.cs" Link="System\Diagnostics\CodeAnalysis\NullableAttributes.cs" />
</ItemGroup>
</When>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<Compile Include="Microsoft\CSharp\RuntimeBinder\Syntax\PredefinedType.cs" />
<Compile Include="Microsoft\CSharp\RuntimeBinder\Syntax\TokenFacts.cs" />
<Compile Include="Microsoft\CSharp\RuntimeBinder\Syntax\TokenKind.cs" />
<Compile Include="$(CoreLibDir)System\Numerics\Hashing\HashHelpers.cs">
<Compile Include="$(CoreLibSharedDir)System\Numerics\Hashing\HashHelpers.cs">
<Link>Common\System\Collections\HashHelpers.cs</Link>
</Compile>
</ItemGroup>
Expand Down
30 changes: 15 additions & 15 deletions ...cs.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->
<ItemGroup>
<Compile Include="$(CoreLibDir)Interop\Windows\Interop.Errors.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Interop.Libraries.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.ActivityControl.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventRegister.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventSetInformation.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventUnregister.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventWriteString.cs" />
<Compile Include="$(CoreLibDir)Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs" />
<Compile Include="$(CoreLibDir)System\Diagnostics\Tracing\*.cs" />
<Compile Remove="$(CoreLibDir)System\Diagnostics\Tracing\FrameworkEventSource.cs" />
<Compile Include="$(CoreLibDir)System\Diagnostics\Tracing\TraceLogging\*.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.Errors.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.Libraries.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.ActivityControl.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventRegister.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventSetInformation.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventUnregister.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventWriteString.cs" />
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\Tracing\*.cs" />
<Compile Remove="$(CoreLibSharedDir)System\Diagnostics\Tracing\FrameworkEventSource.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\Tracing\TraceLogging\*.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
Expand Down
Loading