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

Align MSBuild properties across all projects #437

Merged
merged 6 commits into from
Nov 10, 2023
Merged

Align MSBuild properties across all projects #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00c4dc6
Align MSBuild properties across all projects
joegoldman2 Oct 9, 2023
5540271
Revert TFM for demo projects to original value
joegoldman2 Oct 10, 2023
99e177d
Disable implicit usings on Fido2.csproj
joegoldman2 Oct 11, 2023
d43f745
Switch from TargetFramework to TargetFrameworks on Fido2.Ctap2.Tests …
joegoldman2 Oct 13, 2023
f53b303
Fix NoWarm property
joegoldman2 Oct 13, 2023
2ccd1af
Switch from TargetFramework to TargetFrameworks on Fido2.BlazorWebAss…
joegoldman2 Oct 19, 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
2 changes: 0 additions & 2 deletions BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>11</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>d4e312c9-f55a-43e0-b3ea-699aa6421a5c</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
<LangVersion>11</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -22,5 +20,4 @@
<ProjectReference Include="..\Client\BlazorWasmDemo.Client.csproj" />
</ItemGroup>


</Project>
8 changes: 7 additions & 1 deletion Demo/Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<UserSecretsId>39589262-6aa1-4bde-aaa9-403a7542cf63</UserSecretsId>
<RootNamespace>Fido2Demo</RootNamespace>
<UserSecretsId>39589262-6aa1-4bde-aaa9-403a7542cf63</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Src\Fido2.AspNet\Fido2.AspNet.csproj" />
<ProjectReference Include="..\Src\Fido2.Development\Fido2.Development.csproj" />
<ProjectReference Include="..\Src\Fido2.Models\Fido2.Models.csproj" />
<ProjectReference Include="..\Src\Fido2\Fido2.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
<Folder Include="wwwroot\bulma\" />
</ItemGroup>

<ItemGroup>
<Content Update="Pages\custom.cshtml">
<Pack>$(IncludeRazorContentInPack)</Pack>
Expand All @@ -30,4 +35,5 @@
<Pack>$(IncludeRazorContentInPack)</Pack>
</Content>
</ItemGroup>

</Project>
9 changes: 6 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<!-- Package Metadata -->
<PropertyGroup>
<VersionPrefix>4.0.0-beta3</VersionPrefix>
<VersionSuffix>
</VersionSuffix>
<VersionSuffix></VersionSuffix>
<Description>FIDO2 .NET library (WebAuthn)</Description>
<RepositoryUrl>https://github.com/passwordless-lib/fido2-net-lib</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand All @@ -13,15 +12,19 @@
<PackageProjectUrl>https://github.com/passwordless-lib/fido2-net-lib</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>

<!-- Global Variables -->
<PropertyGroup>
<SupportedTargetFrameworks>net6.0</SupportedTargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<!-- Language + Compiler Settings-->
<PropertyGroup>
<LangVersion>10</LangVersion>
<LangVersion>11</LangVersion>
</PropertyGroup>

<!--MISC-->
<PropertyGroup>
<!-- Avoid annoying build warnings when packing using the solution file -->
Expand Down
9 changes: 5 additions & 4 deletions Src/Fido2.AspNet/Fido2.AspNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<RootNamespace>Fido2NetLib</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Fido2\Fido2.csproj" />
<ProjectReference Include="..\Fido2.Models\Fido2.Models.csproj" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<ProjectReference Include="..\Fido2\Fido2.csproj" />
<ProjectReference Include="..\Fido2.Models\Fido2.Models.csproj" />
</ItemGroup>

</Project>
10 changes: 3 additions & 7 deletions Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>$(SupportedTargetFrameworks)</TargetFramework>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<RootNamespace>Fido2NetLib</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsTrimmable>true</IsTrimmable>
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>
Expand Down Expand Up @@ -39,8 +39,4 @@
</Content>
</ItemGroup>

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

</Project>
5 changes: 3 additions & 2 deletions Src/Fido2.Ctap2/Fido2.Ctap2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<RootNamespace>Fido2NetLib</RootNamespace>
<Nullable>enable</Nullable>
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Fido2\Fido2.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions Src/Fido2.Development/Fido2.Development.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<RootNamespace>Fido2NetLib</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
8 changes: 3 additions & 5 deletions Src/Fido2.Models/Fido2.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RootNamespace>Fido2NetLib</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsTrimmable>true</IsTrimmable>
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<Compile Remove="IMetadataService.cs" />
</ItemGroup>

</Project>
19 changes: 6 additions & 13 deletions Src/Fido2/Fido2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<Nullable>enable</Nullable>
<RootNamespace>Fido2NetLib</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<IsTrimmable>true</IsTrimmable>
<NoWarn>IDE0057</NoWarn>
<LangVersion>11</LangVersion>
<NoWarn>$(NoWarn);IDE0057</NoWarn>
</PropertyGroup>

<ItemGroup>
joegoldman2 marked this conversation as resolved.
Show resolved Hide resolved
<None Remove="Fido2MetadataServiceRepository.cs" />
<None Remove="FileSystemMetadataRepository.cs" />
<None Remove="IMetadataRepository.cs" />
<None Remove="Metadata\ConformanceMetadataRepository.cs" />
<None Remove="StaticMetadataRepository.cs" />
</ItemGroup>

<!-- References -->
<ItemGroup>
<ProjectReference Include="..\Fido2.Models\Fido2.Models.csproj" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
Expand All @@ -32,4 +24,5 @@
-->
<Content Include="build/fido2.targets" PackagePath="build/" />
</ItemGroup>
</Project>

</Project>
7 changes: 3 additions & 4 deletions Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<IsPackable>false</IsPackable>
<LangVersion>preview</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>CA1822,IDE0007,IDE0037,IDE0039,IDE0057,CA1825</NoWarn>
<NoWarn>$(NoWarm);CA1822;IDE0007;IDE0037;IDE0039;IDE0057;CA1825</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down