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.

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

Remove SourceLink dependency no longer required with NET8 SDK #155

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Remove SourceLink dependency no longer required with NET8 SDK #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a4fad
Remove SourceLink dependency no longer required with NET8 SDK
albertospelta Sep 18, 2024
e6cc23b
Enable DebugType=embedded instead of snupkg
albertospelta Sep 18, 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
6 changes: 3 additions & 3 deletions src/Dax.Metadata/Dax.Metadata.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Dax.Metadata</PackageId>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Metadata</PackageProjectUrl>
<Title>Dax.Metadata</Title>
<Description>Tabular model object model including statistics from DMV and data distribution for VertiPaq Analyzer and other tools</Description>
<PackageId>Dax.Metadata</PackageId>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
</ItemGroup>
Expand Down
8 changes: 3 additions & 5 deletions src/Dax.Model.Extractor/Dax.Model.Extractor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Dax.Model.Extractor</PackageId>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Model.Extractor</PackageProjectUrl>
<Title>Dax.Model.Extractor</Title>
<Description>Populate a Dax.Model extracting data from TOM and Analysis Services</Description>
<PackageId>Dax.Model.Extractor</PackageId>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,9 +21,6 @@
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageReference Include="Microsoft.AnalysisServices.retail.amd64" />
<PackageReference Include="Microsoft.AnalysisServices.AdomdClient.retail.amd64" />
Expand Down
9 changes: 3 additions & 6 deletions src/Dax.ViewModel/Dax.ViewModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Dax.ViewModel</PackageId>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.ViewModel</PackageProjectUrl>
<Title>Dax.ViewModel</Title>
<Description>ViewModel to display in a VertiPaq Analyzer viewer the Dax.Model data</Description>
<PackageId>Dax.ViewModel</PackageId>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,10 +21,6 @@
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<AssemblyTitle>Dax.ViewModel .NET Framework 4.6.2</AssemblyTitle>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Dax.ViewVpaExport/Dax.ViewVpaExport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Dax.ViewVpaExport</PackageId>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.ViewVpaExport</PackageProjectUrl>
<Title>Dax.ViewVpaExport</Title>
<Description>Views over Dax.Model data to support export in a VertiPaq Analyzer file</Description>
<PackageId>Dax.ViewVpaExport</PackageId>
</PropertyGroup>

<ItemGroup>
Expand All @@ -21,7 +22,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

Expand Down
11 changes: 5 additions & 6 deletions src/Dax.Vpax.CLI/Dax.Vpax.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<ToolCommandName>vpax</ToolCommandName>
<PackageId>Dax.Vpax.CLI</PackageId>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Vpax.CLI</PackageProjectUrl>
<Title>VertiPaq Analyzer CLI</Title>
<Description>VertiPaq Analyzer Command Line Tool</Description>
<DebugType>embedded</DebugType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<!-- override IncludeSymbols from Directory.Build.props -->
<IncludeSymbols>false</IncludeSymbols>
</PropertyGroup>

<PropertyGroup>
<PackAsTool>true</PackAsTool>
<ToolCommandName>vpax</ToolCommandName>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Dax.Vpax/Dax.Vpax.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Dax.Vpax</PackageId>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Vpax</PackageProjectUrl>
<Title>Dax.Vpax</Title>
<Description>Save and load VPAX files</Description>
<PackageId>Dax.Vpax</PackageId>
</PropertyGroup>

<ItemGroup>
Expand All @@ -22,7 +23,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.IO.Packaging" />
</ItemGroup>
Expand Down
14 changes: 4 additions & 10 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,16 @@
<Company>SQLBI</Company>
<Authors>Marco Russo</Authors>
<Product>VertiPaq Analyzer</Product>
<!--Summary>...</Summary-->
<!--Copyright>Copyright ©</Copyright-->
<PackageTags>VPAX;DAX;VERTIPAQ;ANALYZER</PackageTags>
<PackageIcon>package-icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/sql-bi/VertiPaq-Analyzer</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryBranch>master</RepositoryBranch>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<!--Package Validation-->
<!--EnablePackageValidation>true</EnablePackageValidation-->
<!--PackageValidationBaselineVersion>1.2.15</PackageValidationBaselineVersion-->
<DebugType>embedded</DebugType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
Expand Down
1 change: 0 additions & 1 deletion src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<PackageVersion Include="Microsoft.AnalysisServices.NetCore.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
<PackageVersion Include="Microsoft.AnalysisServices.AdomdClient.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
<PackageVersion Include="Microsoft.AnalysisServices.AdomdClient.NetCore.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.IO.Packaging" Version="6.0.0" />
</ItemGroup>
Expand Down