ff

Author: dellis1972

Directory.Build.props

@@ -4,7 +4,8 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\</_OutputPath>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <NoWarn>CS0436</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -87,8 +88,7 @@
   <PropertyGroup>
     <GitDefaultBranch>main</GitDefaultBranch>
     <GitThisAssemblyMetadata>false</GitThisAssemblyMetadata>
-    <GitThisAssembly>false</GitThisAssembly>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
+    <GitThisAssembly>true</GitThisAssembly>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="GitInfo" Version="*" PrivateAssets="all" />

src/Java.Interop/Java.Interop.csproj

@@ -22,7 +22,6 @@
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <DefineConstants>INTEROP;FEATURE_JNIENVIRONMENT_JI_PINVOKES;FEATURE_JNIOBJECTREFERENCE_INTPTRS;INTERNAL_NULLABLE_ATTRIBUTES;$(JavaInteropDefineConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework.ToLowerInvariant())\</IntermediateOutputPath>
     <OutputPath>$(ToolOutputFullPath)</OutputPath>
     <DocumentationFile>$(ToolOutputFullPath)Java.Interop.xml</DocumentationFile>

src/Java.Interop/Properties/AssemblyInfo.cs

@@ -4,11 +4,8 @@
 
 [assembly: DefaultDllImportSearchPathsAttribute (DllImportSearchPath.SafeDirectories | DllImportSearchPath.AssemblyDirectory)]
 
-[assembly: AssemblyTitle ("Java.Interop")]
 [assembly: AssemblyDescription ("")]
 [assembly: AssemblyCulture ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyProduct ("")]
 
 [assembly: AssemblyMetadata ("IsTrimmable", "True")]
 

src/version/Version.props

@@ -1,12 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <!-- <ItemGroup>
+    <ItemGroup>
         <Compile Include="$(MSBuildThisFileDirectory)AssemblyVersionInfo.cs" />
-    </ItemGroup> -->
-    <PropertyGroup>
-      <Company>Microsoft Corporation</Company>
-      <Copyright>Microsoft Corporation</Copyright>
-      <Trademark>Microsoft Corporation</Trademark>
-      <Version>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)</Version>
-      <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch); git-rev-head: $(GitCommit) git-branch: $(GitBranch)</InformationalVersion>
-    </PropertyGroup>
+    </ItemGroup>
 </Project>

tests/generator-Tests/generator-Tests.csproj

@@ -4,6 +4,8 @@
     <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup>