Merge pull request #42 from tksh164/dev/version-info

Update version info
tksh164 · Aug 21, 2023 · 2bc8b4a · 2bc8b4a
2 parents 2dd5fc6 + 72ea744
commit 2bc8b4a
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 52 deletions.
diff --git a/src/alter/AssemblyInfo.cs b/src/alter/AssemblyInfo.cs
@@ -1,17 +1,5 @@
-using System.Reflection;
 using System.Windows;
 
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyTitle("Alter")]
-[assembly: AssemblyDescription("Alter is a remote desktop client application.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Alter")]
-[assembly: AssemblyCopyright("Copyright (c) 2023-present Takeshi Katano. All rights reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
                                      //(used if a resource is not found in the page,

diff --git a/src/alter/alter.csproj b/src/alter/alter.csproj
@@ -3,14 +3,35 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <RootNamespace>AlterApp</RootNamespace>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationManifest>Resources\app.manifest</ApplicationManifest>
-    <NoWarn>$(NoWarn);WFAC010</NoWarn>
-    <ApplicationIcon>Resources\alter.ico</ApplicationIcon>
+	<UseWindowsForms>true</UseWindowsForms>
+	<Nullable>enable</Nullable>
+    <RootNamespace>AlterApp</RootNamespace>
+	<ApplicationManifest>Resources\app.manifest</ApplicationManifest>
+	<ApplicationIcon>Resources\alter.ico</ApplicationIcon>
+	<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	<NoWarn>$(NoWarn);WFAC010</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- NuGet package -->
+	<Version>0.1.0</Version>
+	<Title>Alter RDP client</Title>
+	<Description>Alter is a remote desktop client application.</Description>
+	<Authors>Takeshi Katano</Authors>
+	<Copyright>Copyright (c) 2023 Takeshi Katano. All rights reserved.</Copyright>
+	<PackageProjectUrl>https://github.com/tksh164/alter-rdp-client</PackageProjectUrl>
+	<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
+	<RepositoryType>git</RepositoryType>
+	<NeutralLanguage>en-US</NeutralLanguage>
+
+	<!-- AssemblyInfo -->
+	<Company></Company>
+	<Product>Alter</Product>
+	<FileVersion>$(Version)</FileVersion>
+	<InformationalVersion>$(Version)</InformationalVersion>
+	<AssemblyVersion>$(Version)</AssemblyVersion>
+	<AssemblyTitle>$(Title)</AssemblyTitle>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/msrdcax/AssemblyInfo.cs b/src/msrdcax/AssemblyInfo.cs
@@ -1,32 +1,9 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Remote Desktop Services ActiveX client for Alter")]
-[assembly: AssemblyDescription("Remote Desktop Services ActiveX client for Alter.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("msrdcax")]
-[assembly: AssemblyCopyright("Copyright (c) 2023-present Takeshi Katano. All rights reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
+//// Setting ComVisible to false makes the types in this assembly not visible 
+//// to COM components.  If you need to access a type in this assembly from 
+//// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
+//// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("df403af2-a5fb-4fcc-8efa-f97f437befd3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/src/msrdcax/msrdcax.csproj b/src/msrdcax/msrdcax.csproj
@@ -2,11 +2,32 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
-    <RootNamespace>MsRdcAx</RootNamespace>
+	<UseWPF>true</UseWPF>
+	<UseWindowsForms>true</UseWindowsForms>
+	<Nullable>enable</Nullable>
+	<RootNamespace>MsRdcAx</RootNamespace>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- NuGet package -->
+	<Version>0.1.0</Version>
+	<Title>Remote Desktop Services ActiveX client for Alter</Title>
+	<Description>$(Title)</Description>
+	<Authors>Takeshi Katano</Authors>
+	<Copyright>Copyright (c) 2023 Takeshi Katano. All rights reserved.</Copyright>
+	<PackageProjectUrl>https://github.com/tksh164/alter-rdp-client</PackageProjectUrl>
+	<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
+	<RepositoryType>git</RepositoryType>
+	<NeutralLanguage>en-US</NeutralLanguage>
+
+	<!-- AssemblyInfo -->
+	<Company></Company>
+	<Product>MsRdcAx</Product>
+	<FileVersion>$(Version)</FileVersion>
+	<InformationalVersion>$(Version)</InformationalVersion>
+	<AssemblyVersion>$(Version)</AssemblyVersion>
+	<AssemblyTitle>$(Title)</AssemblyTitle>
   </PropertyGroup>
 
   <ItemGroup>