Skip to content

Commit

Permalink
signed projects. Added framework for WIX installer (#7)
Browse files Browse the repository at this point in the history
* signed projects.  Added famework for WIX installer

* Removed signing as it is not supported in GitHub actions

* removed signign of DonorData, as it was missed.
  • Loading branch information
WireJunky42 authored May 28, 2020
1 parent b691c6f commit 0c13b63
Show file tree
Hide file tree
Showing 6 changed files with 126 additions and 3 deletions.
2 changes: 2 additions & 0 deletions WJS.ExtraLifeStreamLabelsCore/DonorData/DonorData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>WJS.DonorData</AssemblyName>
<RootNamespace>WJS.DonorData</RootNamespace>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>WJSolutions.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?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>d8d3758c-638b-4d98-9f86-7cd6661dc88c</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Extra Life Stream Lables Installer</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DonorData\DonorData.csproj">
<Name>DonorData</Name>
<Project>{10872569-66e0-48a9-9ccd-51262ead939f}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\ParticipantData\ParticipantData.csproj">
<Name>ParticipantData</Name>
<Project>{e269cb8f-4500-4359-bc93-47b827e72ba1}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\WJS.ExtraLifeStreamLabelsService\WJS.ExtraLifeStreamLabelsService.csproj">
<Name>WJS.ExtraLifeStreamLabelsService</Name>
<Project>{74126b5f-b9fb-4937-8668-431493a20dcb}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</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>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="ExtraLifeStreamLablesInstaller" Language="1033" Version="1.0.0.0" Manufacturer="" UpgradeCode="5f872c7f-a44a-4f8d-8a2e-b5bcf43e1d2b">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate />

<Feature Id="ProductFeature" Title="ExtraLifeStreamLablesInstaller" Level="1">
<ComponentGroupRef Id="ProductComponents" />
</Feature>
</Product>

<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="ExtraLifeStreamLablesInstaller" />
</Directory>
</Directory>
</Fragment>

<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
<!-- <Component Id="ProductComponent"> -->
<File Source="$(var.WJS.ExtraLifeStreamLabelsCore.TargetPath)" />
<!-- </Component> -->
</ComponentGroup>
</Fragment>
</Wix>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>WJS.ParticipantData</AssemblyName>
<RootNamespace>WJS.ParticipantData</RootNamespace>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>WJSolutions.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down
28 changes: 25 additions & 3 deletions WJS.ExtraLifeStreamLabelsCore/WJS.ExtraLifeStreamLabelsCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,52 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WJS.ExtraLifeStreamLabelsService", "WJS.ExtraLifeStreamLabelsService\WJS.ExtraLifeStreamLabelsService.csproj", "{74126B5F-B9FB-4937-8668-431493A20DCB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WJS.ExtraLifeStreamLabelsService", "WJS.ExtraLifeStreamLabelsService\WJS.ExtraLifeStreamLabelsService.csproj", "{74126B5F-B9FB-4937-8668-431493A20DCB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DonorData", "DonorData\DonorData.csproj", "{10872569-66E0-48A9-9CCD-51262EAD939F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DonorData", "DonorData\DonorData.csproj", "{10872569-66E0-48A9-9CCD-51262EAD939F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParticipantData", "ParticipantData\ParticipantData.csproj", "{E269CB8F-4500-4359-BC93-47B827E72BA1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParticipantData", "ParticipantData\ParticipantData.csproj", "{E269CB8F-4500-4359-BC93-47B827E72BA1}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ExtraLifeStreamLablesInstaller", "ExtraLifeStreamLablesInstaller\ExtraLifeStreamLablesInstaller.wixproj", "{D8D3758C-638B-4D98-9F86-7CD6661DC88C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{74126B5F-B9FB-4937-8668-431493A20DCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Debug|x86.ActiveCfg = Debug|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Debug|x86.Build.0 = Debug|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Release|Any CPU.Build.0 = Release|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Release|x86.ActiveCfg = Release|Any CPU
{74126B5F-B9FB-4937-8668-431493A20DCB}.Release|x86.Build.0 = Release|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Debug|x86.ActiveCfg = Debug|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Debug|x86.Build.0 = Debug|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Release|Any CPU.Build.0 = Release|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Release|x86.ActiveCfg = Release|Any CPU
{10872569-66E0-48A9-9CCD-51262EAD939F}.Release|x86.Build.0 = Release|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Debug|x86.ActiveCfg = Debug|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Debug|x86.Build.0 = Debug|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Release|Any CPU.Build.0 = Release|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Release|x86.ActiveCfg = Release|Any CPU
{E269CB8F-4500-4359-BC93-47B827E72BA1}.Release|x86.Build.0 = Release|Any CPU
{D8D3758C-638B-4D98-9F86-7CD6661DC88C}.Debug|Any CPU.ActiveCfg = Debug|x86
{D8D3758C-638B-4D98-9F86-7CD6661DC88C}.Debug|x86.ActiveCfg = Debug|x86
{D8D3758C-638B-4D98-9F86-7CD6661DC88C}.Debug|x86.Build.0 = Debug|x86
{D8D3758C-638B-4D98-9F86-7CD6661DC88C}.Release|Any CPU.ActiveCfg = Release|x86
{D8D3758C-638B-4D98-9F86-7CD6661DC88C}.Release|x86.ActiveCfg = Release|x86
{D8D3758C-638B-4D98-9F86-7CD6661DC88C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<UserSecretsId>dotnet-WJS.ExtraLifeStreamLabelsService-441DCAA1-A9C8-4FEC-9F19-F0B0A3FD728B</UserSecretsId>
<RootNamespace>WJS.ExtraLifeStreamLabelsService</RootNamespace>
<StartupObject>WJS.ExtraLifeStreamLabelsService.Program</StartupObject>
<Version>2.0.0</Version>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>WJSolutions.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 0c13b63

Please sign in to comment.