#582 (comment): removed the condition on CET (#583)

* #582 (comment): removed the condition on CET * Removed specific PropertyGroup for CET
masesgroup · Dec 21, 2024 · b2e90c4 · b2e90c4
1 parent 1a132ca
commit b2e90c4
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 179 deletions.
diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props
@@ -19,8 +19,6 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\Common\JNet.snk</AssemblyOriginatorKeyFile>
 		<NoWarn>$(NoWarn);0618</NoWarn>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
 		<!--see https://learn.microsoft.com/en-us/dotnet/core/compatibility/interop/9.0/cet-support-->
 		<CETCompat>false</CETCompat>
 	</PropertyGroup>

diff --git a/src/net/JNetCLI/JNetCLI.csproj b/src/net/JNetCLI/JNetCLI.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Common\Common.props" />
-  <PropertyGroup>
-	<PackageType>DotnetTool</PackageType>
-    <OutputType>Exe</OutputType>
-    <AssemblyName>MASES.JNetCLI</AssemblyName>
-    <RootNamespace>MASES.JNetCLI</RootNamespace>
-    <Title>JNetCLI - JNet (Java/JVM suite for .NET) command line interface</Title>
-    <Description>JNetCLI - JNet (Java/JVM suite for .NET) command line interface</Description>
-    <Product>JNetCLI</Product>
-    <OutputPath>..\..\..\binCLI\</OutputPath>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <PackageTags>jnet cli dotnet clr netcore net6</PackageTags>
-    <PackageId>MASES.JNetCLI</PackageId>
-    <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
-    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
-  </PropertyGroup>
+	<Import Project="..\Common\Common.props" />
+	<PropertyGroup>
+		<PackageType>DotnetTool</PackageType>
+		<OutputType>Exe</OutputType>
+		<AssemblyName>MASES.JNetCLI</AssemblyName>
+		<RootNamespace>MASES.JNetCLI</RootNamespace>
+		<Title>JNetCLI - JNet (Java/JVM suite for .NET) command line interface</Title>
+		<Description>JNetCLI - JNet (Java/JVM suite for .NET) command line interface</Description>
+		<Product>JNetCLI</Product>
+		<OutputPath>..\..\..\binCLI\</OutputPath>
+		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+		<PackageTags>jnet cli dotnet clr netcore net6</PackageTags>
+		<PackageId>MASES.JNetCLI</PackageId>
+		<RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
+		<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
+	</PropertyGroup>
 	<ItemGroup>
 		<jnetcli_jars Include="$(ProjectDir)\..\..\..\jars\jnet-*" />
 		<None Include="..\..\documentation\articles\usageReflector.md" Pack="true" PackagePath="\" />
@@ -25,17 +25,17 @@
 	<Target Name="CopyCustomContentOnPublish" AfterTargets="Publish">
 		<Copy SourceFiles="@(jnetcli_jars)" DestinationFolder="$(PublishDir)\jars" />
 	</Target>
-  <ItemGroup>
-    <ProjectReference Include="..\JNet\JNet.csproj">
-		<IncludeAssets>All</IncludeAssets>
-        <PrivateAssets>None</PrivateAssets>
-    </ProjectReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="DotnetToolSettings.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\JNet\JNet.csproj">
+			<IncludeAssets>All</IncludeAssets>
+			<PrivateAssets>None</PrivateAssets>
+		</ProjectReference>
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="DotnetToolSettings.xml">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 </Project>
diff --git a/src/net/JNetPS/JNetPS.csproj b/src/net/JNetPS/JNetPS.csproj
@@ -16,11 +16,11 @@
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<OutputType>Exe</OutputType>
 	</PropertyGroup>
-	
+
 	<ItemGroup Condition="True">
 		<jnetps_jars Include="$(ProjectDir)\..\..\..\jars\jnet-*" />
 	</ItemGroup>
-	
+
 	<Target Name="CopyCustomContent" AfterTargets="AfterBuild">
 		<Copy SourceFiles="@(jnetps_jars)" DestinationFolder="$(OutDir)\jars" />
 	</Target>
@@ -39,11 +39,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Update="MASES.JNetPSFramework.psd1" Condition="'$(TargetFramework)' == 'net462'">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-	  <None Update="MASES.JNetPSCore.psd1" Condition="'$(TargetFramework)' == 'net8.0'">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
+		<None Update="MASES.JNetPSFramework.psd1" Condition="'$(TargetFramework)' == 'net462'">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="MASES.JNetPSCore.psd1" Condition="'$(TargetFramework)' == 'net8.0'">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 	</ItemGroup>
 </Project>