Skip to content

Commit

Permalink
Release 2.2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xCONFLiCTiONx committed Jan 17, 2020
1 parent 1cbc9ff commit 8b443af
Show file tree
Hide file tree
Showing 16 changed files with 344 additions and 162 deletions.
6 changes: 6 additions & 0 deletions AssemblyVersionInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using System.Reflection;
using System.Resources;

[assembly: AssemblyVersion("2.2.0.0")]
[assembly: AssemblyFileVersion("2.2.0.0")]
[assembly: NeutralResourcesLanguage("en-US")]
51 changes: 37 additions & 14 deletions DesktopToast/DesktopToast.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,54 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DesktopToast</RootNamespace>
<AssemblyName>DesktopToast</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetPlatformVersion>8.0</TargetPlatformVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Release\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
<DocumentationFile>bin\Debug\DesktopToast.xml</DocumentationFile>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<RunCodeAnalysis>true</RunCodeAnalysis>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Release\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\DesktopToast.xml</DocumentationFile>
<Optimize>true</Optimize>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
<DocumentationFile>bin\Debug\DesktopToast.xml</DocumentationFile>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<RunCodeAnalysis>false</RunCodeAnalysis>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\DesktopToast.xml</DocumentationFile>
<Optimize>true</Optimize>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
22 changes: 0 additions & 22 deletions DesktopToast/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;

// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
// アセンブリに関連付けられている情報を変更するには、
// これらの属性値を変更してください。
[assembly: AssemblyTitle("DesktopToast")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
Expand All @@ -13,23 +10,4 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから
// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、
// その型の ComVisible 属性を true に設定してください。
[assembly: ComVisible(false)]

// 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です
[assembly: Guid("ba284c23-8fa7-410e-ac8b-1d5200593626")]

// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
// 既定値にすることができます:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.5.0.8")]
[assembly: AssemblyFileVersion("0.5.0.8")]
Binary file added LICENSE.rtf
Binary file not shown.
13 changes: 13 additions & 0 deletions NWS Alerts Setup/NWS Alerts Setup.wax
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-16"?>
<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<DeployedProjects>
<string>NWS Alerts\NWS Alerts.csproj</string>
</DeployedProjects>
<DirectoryMappings>
<Item Key="" Value="INSTALLFOLDER" />
</DirectoryMappings>
<FileMappings />
<DeploySymbols>false</DeploySymbols>
<DeployLocalizations>true</DeployLocalizations>
<DeployExternalLocalizations>false</DeployExternalLocalizations>
</Configuration>
78 changes: 78 additions & 0 deletions NWS Alerts Setup/NWS Alerts Setup.wixproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>8f84b1ee-6afc-49fa-8b9c-51a710462c0c</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>NWS Alerts Setup</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>..\SETUP\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\SETUP\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<SuppressPdbOutput>True</SuppressPdbOutput>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<OutputPath>..\SETUP\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\SETUP\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
<SuppressPdbOutput>True</SuppressPdbOutput>
</PropertyGroup>
<ItemGroup>
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
<Content Include="NWS Alerts Setup.wax" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DesktopToast\DesktopToast.csproj">
<Name>DesktopToast</Name>
<Project>{b8d704d5-fb0c-4c2d-8189-72c6649ba157}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\NWS Alerts\NWS Alerts.csproj">
<Name>NWS Alerts</Name>
<Project>{cb7ba755-6053-4716-9284-273d66978262}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
70 changes: 70 additions & 0 deletions NWS Alerts Setup/Product.wxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define NWS Alerts_TargetDir=$(var.NWS Alerts.TargetDir)?><?define DesktopToast_TargetDir=$(var.DesktopToast.TargetDir)?>
<Product Id="*" Name="NWS Alerts" Language="1033" Version="2.2.0.0" Manufacturer="xCONFLiCTiONx" UpgradeCode="fb99dfdd-c3e7-4f83-ae7c-00081d1947b6">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" ></Property>
<WixVariable Id="WixUILicenseRtf" Value="$(var.TargetDir)..\License.rtf" />

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<Media Id="1" Cabinet="bin.cab" EmbedCab="yes" />

<Feature Id="ProductFeature" Title="NWS Alerts" Level="1">
<ComponentGroupRef Id="ProductComponents" />
</Feature>
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="9EA2B08E-9569-4EE4-BDB4-6D7720600C19" />
</Product>

<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<!-- ProgramFilesFolder (x86)-->
<Directory Id="ProgramFiles64Folder">
<Directory Id="INSTALLFOLDER" Name="NWS Alerts" />
</Directory>
</Directory>

<Feature Id="MainApplication" Title="Main Application" Level="1">
<ComponentRef Id="NWS_Alerts.exe" />
</Feature>

<UI>
<UIRef Id="WixUI_InstallDir" />
<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI>
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch NWS Alerts" />

<Property Id="WixShellExecTarget" Value="[#NWS_Alerts.exe]" />

<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />

<Icon Id="icon.ico" SourceFile="$(var.TargetDir)..\NWS Alerts\Resources\DayNotify.ico" />
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
</Fragment>

<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="NWS_Alerts.exe" Guid="e7024831-71d1-43d3-9c0f-797a4c1faa50">
<File Id="NWS_Alerts.exe" Name="NWS Alerts.exe" Source="$(var.NWS Alerts_TargetDir)NWS Alerts.exe" />
</Component>
<Component Id="NWS_Alerts.exe.config" Guid="7cee83e3-eeae-436b-b397-6b8f3af3dbf3">
<File Id="NWS_Alerts.exe.config" Name="NWS Alerts.exe.config" Source="$(var.NWS Alerts_TargetDir)NWS Alerts.exe.config" />
</Component>
<Component Id="DesktopToast.dll" Guid="48837c39-dcb4-43b4-ad2b-1ac87fb397fa">
<File Id="DesktopToast.dll" Name="DesktopToast.dll" Source="$(var.DesktopToast_TargetDir)DesktopToast.dll" />
</Component>
<Component Id="NotificationsExtensions.Win10.dll" Guid="43ef4e2a-c2c6-4895-9f9b-c47e44e3e3d0">
<File Id="NotificationsExtensions.Win10.dll" Name="NotificationsExtensions.Win10.dll" Source="$(var.NWS Alerts_TargetDir)NotificationsExtensions.Win10.dll" />
</Component>
<Component Id="EasyLogger.dll" Guid="2c4fa0dd-29cd-4ccf-9b76-173a86dc5eab">
<File Id="EasyLogger.dll" Name="EasyLogger.dll" Source="$(var.NWS Alerts_TargetDir)EasyLogger.dll" />
</Component>
<Component Id="WindowPlacementHelper.dll" Guid="a1fc9da2-872d-49c7-a1dc-80052085298b">
<File Id="WindowPlacementHelper.dll" Name="WindowPlacementHelper.dll" Source="$(var.NWS Alerts_TargetDir)WindowPlacementHelper.dll" />
</Component>
<Component Id="DesktopToast.png" Guid="46C3A967-49A1-4B15-A2F3-F4DAAEE07B6E">
<File Id="DesktopToast.png" Name="DesktopToast.png" Source="$(var.NWS Alerts_TargetDir)DesktopToast.png" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
44 changes: 34 additions & 10 deletions NWS Alerts.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,44 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NWS Alerts", "NWS Alerts\NW
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopToast", "DesktopToast\DesktopToast.csproj", "{B8D704D5-FB0C-4C2D-8189-72C6649BA157}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "NWS Alerts Setup", "NWS Alerts Setup\NWS Alerts Setup.wixproj", "{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A53F850E-6A86-4DBC-88E8-4006DF3CF820}"
ProjectSection(SolutionItems) = preProject
AssemblyVersionInfo.cs = AssemblyVersionInfo.cs
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CB7BA755-6053-4716-9284-273D66978262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB7BA755-6053-4716-9284-273D66978262}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB7BA755-6053-4716-9284-273D66978262}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB7BA755-6053-4716-9284-273D66978262}.Release|Any CPU.Build.0 = Release|Any CPU
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Release|Any CPU.Build.0 = Release|Any CPU
{CB7BA755-6053-4716-9284-273D66978262}.Debug|x64.ActiveCfg = Debug|x64
{CB7BA755-6053-4716-9284-273D66978262}.Debug|x64.Build.0 = Debug|x64
{CB7BA755-6053-4716-9284-273D66978262}.Debug|x86.ActiveCfg = Debug|x86
{CB7BA755-6053-4716-9284-273D66978262}.Debug|x86.Build.0 = Debug|x86
{CB7BA755-6053-4716-9284-273D66978262}.Release|x64.ActiveCfg = Release|x64
{CB7BA755-6053-4716-9284-273D66978262}.Release|x64.Build.0 = Release|x64
{CB7BA755-6053-4716-9284-273D66978262}.Release|x86.ActiveCfg = Release|x86
{CB7BA755-6053-4716-9284-273D66978262}.Release|x86.Build.0 = Release|x86
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Debug|x64.ActiveCfg = Debug|x64
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Debug|x64.Build.0 = Debug|x64
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Debug|x86.ActiveCfg = Debug|x86
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Debug|x86.Build.0 = Debug|x86
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Release|x64.ActiveCfg = Release|x64
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Release|x64.Build.0 = Release|x64
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Release|x86.ActiveCfg = Release|x86
{B8D704D5-FB0C-4C2D-8189-72C6649BA157}.Release|x86.Build.0 = Release|x86
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Debug|x64.ActiveCfg = Debug|x64
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Debug|x86.ActiveCfg = Debug|x86
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Debug|x86.Build.0 = Debug|x86
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Release|x64.ActiveCfg = Release|x64
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Release|x64.Build.0 = Release|x64
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Release|x86.ActiveCfg = Release|x86
{8F84B1EE-6AFC-49FA-8B9C-51A710462C0C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
File renamed without changes
Loading

0 comments on commit 8b443af

Please sign in to comment.