Skip to content

Commit a33848c

Browse files
authored
SourceLink consolidation (#384)
* Consolidate SourceLink reference to shared build props * Add other Directory.Build.props to solution
1 parent 5e72564 commit a33848c

File tree

7 files changed

+5
-19
lines changed

7 files changed

+5
-19
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Root build props for the whole solution -->
12
<Project>
23
<!-- Package Metadata -->
34
<PropertyGroup>

Src/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Build props for the libraries (anything under Src/) -->
12
<Project>
23
<Import Project="..\Directory.Build.props"/>
34

@@ -7,7 +8,7 @@
78
<PublishRepositoryUrl>true</PublishRepositoryUrl>
89
</PropertyGroup>
910
<ItemGroup>
10-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1112
</ItemGroup>
1213

1314
<!-- Projects inside "./src" should generate packages -->

Src/Fido2.AspNet/Fido2.AspNet.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
<ProjectReference Include="..\Fido2.Models\Fido2.Models.csproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup>
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
15-
</ItemGroup>
16-
1713
<ItemGroup>
1814
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1915
</ItemGroup>

Src/Fido2.Ctap2/Fido2.Ctap2.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@
1010
<ItemGroup>
1111
<ProjectReference Include="..\Fido2\Fido2.csproj" />
1212
</ItemGroup>
13-
14-
<ItemGroup>
15-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
16-
</ItemGroup>
17-
1813
</Project>

Src/Fido2.Models/Fido2.Models.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,4 @@
1010
<ItemGroup>
1111
<Compile Remove="IMetadataService.cs" />
1212
</ItemGroup>
13-
14-
<ItemGroup>
15-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
16-
</ItemGroup>
1713
</Project>

Src/Fido2/Fido2.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,4 @@
3131
-->
3232
<Content Include="build/fido2.targets" PackagePath="build/" />
3333
</ItemGroup>
34-
35-
<ItemGroup>
36-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
37-
</ItemGroup>
3834
</Project>

fido2-net-lib.sln

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
ProjectSection(SolutionItems) = preProject
1414
.editorconfig = .editorconfig
1515
Directory.Build.props = Directory.Build.props
16+
Src\Directory.Build.props = Src\Directory.Build.props
1617
EndProjectSection
1718
EndProject
1819
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Models", "Src\Fido2.Models\Fido2.Models.csproj", "{08AA0431-3BBF-49EF-8DEF-5433B3068D92}"
@@ -21,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.AspNet", "Src\Fido2.A
2122
EndProject
2223
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Ctap2", "Src\Fido2.Ctap2\Fido2.Ctap2.csproj", "{5B998DB8-6E96-4012-B524-32E113815059}"
2324
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fido2.Ctap2.Tests", "Tests\Fido2.Ctap2.Tests\Fido2.Ctap2.Tests.csproj", "{BB3D1D09-1506-4DF9-8211-8B284E12B0F8}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Ctap2.Tests", "Tests\Fido2.Ctap2.Tests\Fido2.Ctap2.Tests.csproj", "{BB3D1D09-1506-4DF9-8211-8B284E12B0F8}"
2526
EndProject
2627
Global
2728
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)