Skip to content

Fixing the sourcelink failure for embeded files #33521

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
Anipik merged 8 commits into from
Mar 15, 2020
Merged

Fixing the sourcelink failure for embeded files #33521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d9fd3f
fixing sourcelink
Anipik Mar 12, 2020
75eb057
enable sourcelink on official build
Anipik Mar 12, 2020
52f9b31
addressing feedback
Anipik Mar 13, 2020
f7b25a9
removing extra space
Anipik Mar 13, 2020
c1abd28
reverting eng common change
Anipik Mar 13, 2020
c73ef74
adding comment
Anipik Mar 13, 2020
80b8dc8
moving comment to correct place
Anipik Mar 13, 2020
9eebb21
not embedding files for test assemblies
Anipik Mar 13, 2020
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
11 changes: 11 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,15 @@
<NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
</PropertyGroup>

<PropertyGroup>
<GeneratedAssemblyInfoFile>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(MSBuildProjectName).AssemblyInfo$(DefaultLanguageSourceExtension)'))</GeneratedAssemblyInfoFile>
</PropertyGroup>

<!--
All source inputs to the compiler should be generated before BeforeCompile target. Sdk is not
honoring this for GenerateAssemblyInfo target. https://github.com/dotnet/sdk/issues/10614
-->
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>
</Project>
15 changes: 0 additions & 15 deletions eng/DisableSourceControlManagement.targets
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion eng/pipelines/official/stages/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stages:
# Symbol validation is not ready yet. https://github.com/dotnet/arcade/issues/2871
enableSymbolValidation: false
# SourceLink validation doesn't work in dev builds: tries to pull from GitHub. https://github.com/dotnet/arcade/issues/3604
enableSourceLinkValidation: false
enableSourceLinkValidation: true
# Allow symbol publish to emit expected warnings without failing the build. Include single
# quotes inside the string so that it passes through to MSBuild without script interference.
symbolPublishingAdditionalParameters: "'-warnAsError:$false'"
Expand Down
1 change: 1 addition & 0 deletions eng/versioning.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<!-- Note: ReferenceAssemblies.targets still uses @(AssemblyInfoLines) as well. So if you remove this, those need to migrate too. -->
<Target Name="_WriteNonStringAssemblyInfoAttributes"
AfterTargets="CoreGenerateAssemblyInfo"
BeforeTargets="BeforeCompile;CoreCompile"
Inputs="$(MSBuildProjectFile)"
Outputs="$(AssemblyInfoFile)">

Expand Down
6 changes: 0 additions & 6 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 @@ -104,12 +104,6 @@
<StrongNameKeyId>SilverlightPlatform</StrongNameKeyId>
</PropertyGroup>

<!-- SourceLink -->
<PropertyGroup>
<!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<!--
Helper Paths
-->
Expand Down
2 changes: 0 additions & 2 deletions src/installer/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

<Import Project="..\..\Directory.Build.targets" />

<Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />

<!-- Provide default targets which can be hooked onto or overridden as necessary -->
<Target Name="Pack" />

Expand Down
1 change: 0 additions & 1 deletion src/libraries/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<!-- Workaround for https://github.com/microsoft/msbuild/issues/4474 -->
<GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@
<!-- Import Packaging targets -->
<Import Project="$(RepositoryEngineeringDir)packaging.targets" />

<Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />

<!-- Define this now until we can clean-up targets that depend on it in the packaging targets -->
<Target Name="CreateVersionFileDuringBuild" />

Expand Down
6 changes: 0 additions & 6 deletions src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@
<StrongNameKeyId>SilverlightPlatform</StrongNameKeyId>
</PropertyGroup>

<!-- SourceLink -->
<PropertyGroup>
<!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<!--
Helper Paths
-->
Expand Down