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

Jump to bottom

SourceLink consolidation #384

Merged
merged 2 commits into from
May 11, 2023
Merged

SourceLink consolidation #384

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
dd7b768
Consolidate SourceLink reference to shared build props
Regenhardt Mar 8, 2023
a6aaa37
Add other Directory.Build.props to solution
Regenhardt Mar 8, 2023
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
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- Root build props for the whole solution -->
<Project>
<!-- Package Metadata -->
<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion Src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- Build props for the libraries (anything under Src/) -->
<Project>
<Import Project="..\Directory.Build.props"/>

Expand All @@ -7,7 +8,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<!-- Projects inside "./src" should generate packages -->
Expand Down
4 changes: 0 additions & 4 deletions Src/Fido2.AspNet/Fido2.AspNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<ProjectReference Include="..\Fido2.Models\Fido2.Models.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions Src/Fido2.Ctap2/Fido2.Ctap2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,4 @@
<ItemGroup>
<ProjectReference Include="..\Fido2\Fido2.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions Src/Fido2.Models/Fido2.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,4 @@
<ItemGroup>
<Compile Remove="IMetadataService.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions Src/Fido2/Fido2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,4 @@
-->
<Content Include="build/fido2.targets" PackagePath="build/" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion fido2-net-lib.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
Src\Directory.Build.props = Src\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Models", "Src\Fido2.Models\Fido2.Models.csproj", "{08AA0431-3BBF-49EF-8DEF-5433B3068D92}"
Expand All @@ -21,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.AspNet", "Src\Fido2.A
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Ctap2", "Src\Fido2.Ctap2\Fido2.Ctap2.csproj", "{5B998DB8-6E96-4012-B524-32E113815059}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fido2.Ctap2.Tests", "Tests\Fido2.Ctap2.Tests\Fido2.Ctap2.Tests.csproj", "{BB3D1D09-1506-4DF9-8211-8B284E12B0F8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Ctap2.Tests", "Tests\Fido2.Ctap2.Tests\Fido2.Ctap2.Tests.csproj", "{BB3D1D09-1506-4DF9-8211-8B284E12B0F8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down