Aggiunta compilazione multi-target

italia · Aug 22, 2023 · 7b06bbc · 7b06bbc
1 parent ddc449e
commit 7b06bbc
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 58 deletions.
diff --git a/...NetCore.Authentication/CIE.AspNetCore.Authentication/CIE.AspNetCore.Authentication.csproj b/...NetCore.Authentication/CIE.AspNetCore.Authentication/CIE.AspNetCore.Authentication.csproj
@@ -1,65 +1,82 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <Description>AspNetCore Remote Authenticator for CIE</Description>
-    <Authors>Daniele Giallonardo, Stefano Mostarda</Authors>
-    <AssemblyName>CIE.AspNetCore.Authentication</AssemblyName>
-    <RootNamespace>CIE.AspNetCore.Authentication</RootNamespace>
-    <PackageId>CIE.AspNetCore.Authentication</PackageId>
-    <PackageTags>cie;aspnetcore;authentication</PackageTags>
-    <PackageProjectUrl>https://github.com/italia/cie-aspnetcore</PackageProjectUrl>
-    <PackageIcon>cie-nuget.png</PackageIcon>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageVersion>2.0.2</PackageVersion>
-    <Version>2.0.2</Version>
-    <AssemblyVersion>2.0.2</AssemblyVersion>
-    <FileVersion>2.0.2</FileVersion>
-    <InformationalVersion>2.0.2</InformationalVersion>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/italia/cie-aspnetcore</RepositoryUrl>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+		<LangVersion>latest</LangVersion>
+		<Description>AspNetCore Remote Authenticator for CIE</Description>
+		<Authors>Daniele Giallonardo, Stefano Mostarda</Authors>
+		<AssemblyName>CIE.AspNetCore.Authentication</AssemblyName>
+		<RootNamespace>CIE.AspNetCore.Authentication</RootNamespace>
+		<PackageId>CIE.AspNetCore.Authentication</PackageId>
+		<PackageTags>cie;aspnetcore;authentication</PackageTags>
+		<PackageProjectUrl>https://github.com/italia/cie-aspnetcore</PackageProjectUrl>
+		<PackageIcon>cie-nuget.png</PackageIcon>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageVersion>2.0.3</PackageVersion>
+		<Version>2.0.3</Version>
+		<AssemblyVersion>2.0.3</AssemblyVersion>
+		<FileVersion>2.0.3</FileVersion>
+		<InformationalVersion>2.0.3</InformationalVersion>
+		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<RepositoryUrl>https://github.com/italia/cie-aspnetcore</RepositoryUrl>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.21" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="Mvc\Resources\cie-nuget.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Mvc\Resources\cie-button.png" />
-  </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+		<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.10" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Mvc\Resources\cie-button.png" />
-  </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+		<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.21" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.16" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.5" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
-  </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+		<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.17" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Xml" Version="5.0.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Resources\ErrorLocalization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ErrorLocalization.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Resources\ErrorLocalization.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ErrorLocalization.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\README.md" Pack="true" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="Mvc\Resources\cie-nuget.png" Pack="true" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Remove="Mvc\Resources\cie-button.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Include="Mvc\Resources\cie-button.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Update="Resources\ErrorLocalization.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ErrorLocalization.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Update="Resources\ErrorLocalization.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>ErrorLocalization.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
 </Project>
diff --git a/...Core.Authentication/CIE.AspNetCore.Authentication/Resources/ErrorLocalization.Designer.cs b/...Core.Authentication/CIE.AspNetCore.Authentication/Resources/ErrorLocalization.Designer.cs
diff --git a/CIE.AspNetCore.Authentication/CIE.AspNetCore.WebApp/CIE.AspNetCore.WebApp.csproj b/CIE.AspNetCore.Authentication/CIE.AspNetCore.WebApp/CIE.AspNetCore.WebApp.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>