Skip to content
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.

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

Enhance project and target files to generate debugging symbol package files #2137

Merged
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e1b23eb
Enchance project and target files to generate debugging symbols for n…
arellegue Aug 24, 2023
96dabe4
Moved duplicate Nuget packaging properties from all csproj files int…
arellegue Aug 28, 2023
bf8da42
Applied changes as per PR Review.
arellegue Aug 30, 2023
64cc0f8
Refactored Directory.build.Props, Versions.props, build.proj and MDS.…
arellegue Oct 30, 2023
f293ae0
Removed empty line to trigger piepline.
arellegue Nov 7, 2023
fc3b975
Removed Microsoft.DotNet.XUnitExtensions.csproj which also no longer …
arellegue Nov 7, 2023
09783a3
Moved package reference Microsoft.SourceLink.GitHub from Versions.pro…
arellegue Nov 7, 2023
3ff66ae
Removed commented out lines to trigger pipeline.
arellegue Nov 7, 2023
30579ce
Resolve conflict in build.proj
arellegue Nov 7, 2023
47da0ee
Moved package reference to Microsoft.SourceLink.GitHub back to each c…
arellegue Nov 7, 2023
ca3e5b2
Added TF_BUILD condition.
arellegue Nov 8, 2023
fc46a72
Add condition TF_BUILD == true to all references to Microsoft.SourceL…
arellegue Nov 14, 2023
c542b35
Updated BUILDGUIDE.md to show example of TF_BUILD.
arellegue Nov 15, 2023
10314e7
Gathering all sourceLink related in directory.Build.props. Address a …
Jan 18, 2024
7f8abdd
adding extra line at the end of build.proj
Jan 18, 2024
d40c01d
commit
Jan 18, 2024
7ca6635
Removing TF_BUILD from Microsoft.SourceLink.GitHub
Jan 18, 2024
4e6e7af
minor changes.
Jan 19, 2024
6ff85b1
Make inline comment of TF_Build
DavoudEshtehari Jan 24, 2024
bfef5aa
Merge remote-tracking branch 'Upstream/main' into SupportNewSymbolsPa…
DavoudEshtehari Jan 24, 2024
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
Prev Previous commit
Next Next commit
Applied changes as per PR Review.
arellegue committed Aug 30, 2023
commit bf8da42416ae63f45de23748a739398acc9419be
8 changes: 4 additions & 4 deletions build.proj
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
The provided path should be ended to a `\` character without white spaces: Ex. C:\x86\
-->
<DotnetPath></DotnetPath>
<!-- Using these properties to compile and pack netfx dll fixes nuget package explorer error "Compiler flags: missing" -->
<!-- Using these properties to compile and pack netfx dll fixes nuget package explorer error "Compiler flags: missing" -->
arellegue marked this conversation as resolved.
Show resolved Hide resolved
<NugetPackProperties>DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;ContinuousIntegrationBuild=true;Deterministic=true;</NugetPackProperties>
</PropertyGroup>

@@ -206,17 +206,17 @@

<!-- Only build platform specific builds for Package reference types -->
<Message Text=">>> Building AKVNetFx [$(CI);TestTargetOS=$(TestOS)netfx;Platform=$(Platform);$(TestProjectProperties)] ..." Condition="$(ReferenceType.Contains('Package'))"/>
<MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netfx;Platform=$(Platform);$(TestProjectProperties);$(NugetPackProperties)" Condition="$(ReferenceType.Contains('Package'))"/>
<MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netfx;Platform=$(Platform);$(TestProjectProperties);$(NugetPackProperties)" Condition="$(ReferenceType.Contains('Package'))"/>
</Target>

<Target Name="BuildAKVNetCore">
<MSBuild Projects="@(AKVProvider)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
<Message Text=">>> Building AKVNetCore [$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;ReferenceType=$(ReferenceType);] ..." Condition="!$(ReferenceType.Contains('Package'))"/>
<MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;" Condition="!$(ReferenceType.Contains('Package'))"/>
<MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;" Condition="!$(ReferenceType.Contains('Package'))"/>

<!-- Only build platform specific builds for Package reference types -->
<Message Text=">>> Building AKVNetCore [$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=$(Platform);ReferenceType=$(ReferenceType);] ..." Condition="$(ReferenceType.Contains('Package'))"/>
<MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))"/>
<MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))"/>
</Target>

<Target Name="BuildAKVNetSt">
5 changes: 4 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -79,10 +79,13 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUnTrackedSources>true</EmbedUnTrackedSources>
</PropertyGroup>
<!-- Packaging Extension CI Builds -->
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
arellegue marked this conversation as resolved.
Show resolved Hide resolved
<!-- Repository Url is required for none SDK project even if it is already in nuspec file. -->
arellegue marked this conversation as resolved.
Show resolved Hide resolved
<RepositoryUrl>https://github.com/dotnet/sqlclient</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<EmbedUnTrackedSources>true</EmbedUnTrackedSources>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
arellegue marked this conversation as resolved.
Show resolved Hide resolved
<Deterministic>true</Deterministic>
</PropertyGroup>
Original file line number Diff line number Diff line change
@@ -31,10 +31,7 @@
<ItemGroup>
<PackageReference Condition="$(BuildForRelease) == 'true'" Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All" />
<PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="$(AzureSecurityKeyVaultKeysVersion)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
Original file line number Diff line number Diff line change
@@ -24,9 +24,6 @@
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
@@ -972,10 +969,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Condition="$(TargetGroup) == 'netstandard' and '$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
Original file line number Diff line number Diff line change
@@ -716,10 +716,6 @@
</COMReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Encodings.Web">
<Version>$(SystemTextEncodingsWebVersion)</Version>
</PackageReference>
Original file line number Diff line number Diff line change
@@ -40,9 +40,6 @@
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
arellegue marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All" />
</ItemGroup>

<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
</Project>
6 changes: 6 additions & 0 deletions tools/props/Versions.props
Original file line number Diff line number Diff line change
@@ -83,4 +83,10 @@
<TestAKVProviderVersion>$(NugetPackageVersion)</TestAKVProviderVersion>
<TestMicrosoftDataSqlClientVersion>$(NugetPackageVersion)</TestMicrosoftDataSqlClientVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>