Skip to content

Commit 897c363

Browse files
albertospeltaalbertospelta
authored
Remove SourceLink dependency no longer required with NET8 SDK (#155)
* Remove SourceLink dependency no longer required with NET8 SDK Source Link is now included in the .NET SDK * Enable DebugType=embedded instead of snupkg
1 parent 1257949 commit 897c363

File tree

8 files changed

+24
-37
lines changed

8 files changed

+24
-37
lines changed

‎src/Dax.Metadata/Dax.Metadata.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
65
</PropertyGroup>
76

87
<PropertyGroup>
8+
<IsPackable>true</IsPackable>
9+
<PackageId>Dax.Metadata</PackageId>
10+
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Metadata</PackageProjectUrl>
911
<Title>Dax.Metadata</Title>
1012
<Description>Tabular model object model including statistics from DMV and data distribution for VertiPaq Analyzer and other tools</Description>
11-
<PackageId>Dax.Metadata</PackageId>
1213
</PropertyGroup>
1314

1415
<PropertyGroup>
1516
<DefineConstants>$(AdditionalConstants)</DefineConstants>
1617
</PropertyGroup>
1718

1819
<ItemGroup>
19-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2020
<PackageReference Include="Newtonsoft.Json" />
2121
<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
2222
</ItemGroup>

‎src/Dax.Model.Extractor/Dax.Model.Extractor.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
65
</PropertyGroup>
76

87
<PropertyGroup>
8+
<IsPackable>true</IsPackable>
9+
<PackageId>Dax.Model.Extractor</PackageId>
10+
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Model.Extractor</PackageProjectUrl>
911
<Title>Dax.Model.Extractor</Title>
1012
<Description>Populate a Dax.Model extracting data from TOM and Analysis Services</Description>
11-
<PackageId>Dax.Model.Extractor</PackageId>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
@@ -20,9 +21,6 @@
2021
<DefineConstants>$(AdditionalConstants)</DefineConstants>
2122
</PropertyGroup>
2223

23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
25-
</ItemGroup>
2624
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
2725
<PackageReference Include="Microsoft.AnalysisServices.retail.amd64" />
2826
<PackageReference Include="Microsoft.AnalysisServices.AdomdClient.retail.amd64" />

‎src/Dax.ViewModel/Dax.ViewModel.csproj

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
65
</PropertyGroup>
76

87
<PropertyGroup>
8+
<IsPackable>true</IsPackable>
9+
<PackageId>Dax.ViewModel</PackageId>
10+
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.ViewModel</PackageProjectUrl>
911
<Title>Dax.ViewModel</Title>
1012
<Description>ViewModel to display in a VertiPaq Analyzer viewer the Dax.Model data</Description>
11-
<PackageId>Dax.ViewModel</PackageId>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
@@ -20,10 +21,6 @@
2021
<DefineConstants>$(AdditionalConstants)</DefineConstants>
2122
</PropertyGroup>
2223

23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
25-
</ItemGroup>
26-
2724
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
2825
<AssemblyTitle>Dax.ViewModel .NET Framework 4.6.2</AssemblyTitle>
2926
</PropertyGroup>

‎src/Dax.ViewVpaExport/Dax.ViewVpaExport.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
65
</PropertyGroup>
76

87
<PropertyGroup>
8+
<IsPackable>true</IsPackable>
9+
<PackageId>Dax.ViewVpaExport</PackageId>
10+
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.ViewVpaExport</PackageProjectUrl>
911
<Title>Dax.ViewVpaExport</Title>
1012
<Description>Views over Dax.Model data to support export in a VertiPaq Analyzer file</Description>
11-
<PackageId>Dax.ViewVpaExport</PackageId>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
@@ -21,7 +22,6 @@
2122
</PropertyGroup>
2223

2324
<ItemGroup>
24-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2525
<PackageReference Include="Newtonsoft.Json" />
2626
</ItemGroup>
2727

‎src/Dax.Vpax.CLI/Dax.Vpax.CLI.csproj

+5-6
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@
1414

1515
<PropertyGroup>
1616
<IsPackable>true</IsPackable>
17-
<PackAsTool>true</PackAsTool>
18-
<ToolCommandName>vpax</ToolCommandName>
1917
<PackageId>Dax.Vpax.CLI</PackageId>
2018
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Vpax.CLI</PackageProjectUrl>
2119
<Title>VertiPaq Analyzer CLI</Title>
2220
<Description>VertiPaq Analyzer Command Line Tool</Description>
23-
<DebugType>embedded</DebugType>
24-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
25-
<!-- override IncludeSymbols from Directory.Build.props -->
26-
<IncludeSymbols>false</IncludeSymbols>
21+
</PropertyGroup>
22+
23+
<PropertyGroup>
24+
<PackAsTool>true</PackAsTool>
25+
<ToolCommandName>vpax</ToolCommandName>
2726
</PropertyGroup>
2827

2928
<ItemGroup>

‎src/Dax.Vpax/Dax.Vpax.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
65
</PropertyGroup>
76

87
<PropertyGroup>
8+
<IsPackable>true</IsPackable>
9+
<PackageId>Dax.Vpax</PackageId>
10+
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer/tree/master/src/Dax.Vpax</PackageProjectUrl>
911
<Title>Dax.Vpax</Title>
1012
<Description>Save and load VPAX files</Description>
11-
<PackageId>Dax.Vpax</PackageId>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
@@ -22,7 +23,6 @@
2223
</PropertyGroup>
2324

2425
<ItemGroup>
25-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2626
<PackageReference Include="Newtonsoft.Json" />
2727
<PackageReference Include="System.IO.Packaging" />
2828
</ItemGroup>

‎src/Directory.Build.props

+4-10
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,16 @@
1616
<Company>SQLBI</Company>
1717
<Authors>Marco Russo</Authors>
1818
<Product>VertiPaq Analyzer</Product>
19-
<!--Summary>...</Summary-->
20-
<!--Copyright>Copyright ©</Copyright-->
2119
<PackageTags>VPAX;DAX;VERTIPAQ;ANALYZER</PackageTags>
2220
<PackageIcon>package-icon.png</PackageIcon>
2321
<PackageReadmeFile>README.md</PackageReadmeFile>
2422
<PackageLicenseExpression>MIT</PackageLicenseExpression>
25-
<PackageProjectUrl>https://github.com/sql-bi/VertiPaq-Analyzer</PackageProjectUrl>
26-
<RepositoryType>git</RepositoryType>
2723
<RepositoryUrl>https://github.com/sql-bi/VertiPaq-Analyzer</RepositoryUrl>
24+
<RepositoryType>git</RepositoryType>
25+
<RepositoryBranch>master</RepositoryBranch>
2826
<PublishRepositoryUrl>true</PublishRepositoryUrl>
29-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
30-
<IncludeSymbols>true</IncludeSymbols>
31-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32-
<!--Package Validation-->
33-
<!--EnablePackageValidation>true</EnablePackageValidation-->
34-
<!--PackageValidationBaselineVersion>1.2.15</PackageValidationBaselineVersion-->
27+
<DebugType>embedded</DebugType>
28+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3529
</PropertyGroup>
3630

3731
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">

‎src/Directory.Packages.props

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<PackageVersion Include="Microsoft.AnalysisServices.NetCore.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
1414
<PackageVersion Include="Microsoft.AnalysisServices.AdomdClient.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
1515
<PackageVersion Include="Microsoft.AnalysisServices.AdomdClient.NetCore.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
16-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
1716
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1817
<PackageVersion Include="System.IO.Packaging" Version="6.0.0" />
1918
</ItemGroup>

0 commit comments

Comments
 (0)