Merge with default OUT-417
authorThomas
Tue, 20 Mar 2018 12:28:27 +0100
branchOUT-417
changeset 20700ada1c4cebdd
parent 2069 e7a29b63f826
parent 2062 959858ccbf5d
child 2071 6317374391e9
Merge with default
     1.1 --- a/Properties/AssemblyInfo.cs	Tue Mar 20 12:27:44 2018 +0100
     1.2 +++ b/Properties/AssemblyInfo.cs	Tue Mar 20 12:28:27 2018 +0100
     1.3 @@ -43,5 +43,5 @@
     1.4  // You can specify all the values or you can default the Build and Revision Numbers 
     1.5  // by using the '*' as shown below:
     1.6  // [assembly: AssemblyVersion("1.0.*")]
     1.7 -[assembly: AssemblyVersion("1.0.91.0")]
     1.8 -[assembly: AssemblyFileVersion("1.0.91.0")]
     1.9 +[assembly: AssemblyVersion("1.0.92.0")]
    1.10 +[assembly: AssemblyFileVersion("1.0.92.0")]
     2.1 --- a/pEpForOutlook.csproj	Tue Mar 20 12:27:44 2018 +0100
     2.2 +++ b/pEpForOutlook.csproj	Tue Mar 20 12:28:27 2018 +0100
     2.3 @@ -37,11 +37,13 @@
     2.4      </UpgradeBackupLocation>
     2.5      <OldToolsVersion>4.0</OldToolsVersion>
     2.6      <VSTO_TrustAssembliesLocation>true</VSTO_TrustAssembliesLocation>
     2.7 +    <NuGetPackageImportStamp>
     2.8 +    </NuGetPackageImportStamp>
     2.9      <BootstrapperEnabled>true</BootstrapperEnabled>
    2.10      <PublishUrl>publish\</PublishUrl>
    2.11      <InstallUrl>https://pep-project.org/</InstallUrl>
    2.12      <TargetCulture>en</TargetCulture>
    2.13 -    <ApplicationVersion>1.0.91.0</ApplicationVersion>
    2.14 +    <ApplicationVersion>1.0.92.0</ApplicationVersion>
    2.15      <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    2.16      <UpdateEnabled>true</UpdateEnabled>
    2.17      <UpdateInterval>0</UpdateInterval>
    2.18 @@ -52,8 +54,6 @@
    2.19      <FriendlyName>pEp</FriendlyName>
    2.20      <OfficeApplicationDescription />
    2.21      <LoadBehavior>3</LoadBehavior>
    2.22 -    <NuGetPackageImportStamp>
    2.23 -    </NuGetPackageImportStamp>
    2.24    </PropertyGroup>
    2.25    <ItemGroup>
    2.26      <BootstrapperPackage Include=".NETFramework,Version=v4.0">
    2.27 @@ -624,7 +624,7 @@
    2.28    <ProjectExtensions>
    2.29      <VisualStudio>
    2.30        <FlavorProperties GUID="{BAA0C2D2-18E2-41B9-852F-F413020CAA33}">
    2.31 -        <ProjectProperties HostName="Outlook" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="Outlook" Language="cs" TemplatesPath="VSTOTemplates" DebugInfoExeName="#Software\Microsoft\Office\15.0\Outlook\InstallRoot\Path#outlook.exe" AddItemTemplatesGuid="{A58A78EB-1C92-4DDD-80CF-E8BD872ABFC4}" />
    2.32 +        <ProjectProperties HostName="Outlook" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="Outlook" Language="cs" TemplatesPath="VSTOTemplates" DebugInfoExeName="#Software\Microsoft\Office\16.0\Outlook\InstallRoot\Path#outlook.exe" AddItemTemplatesGuid="{A58A78EB-1C92-4DDD-80CF-E8BD872ABFC4}" />
    2.33          <Host Name="Outlook" GeneratedCodeNamespace="pEp" PublishedHash="69C324AB27932AA2FBF2B7EA72250886FF164DE6" IconIndex="0">
    2.34            <HostItem Name="ThisAddIn" Code="ThisAddIn.cs" CanonicalName="AddIn" PublishedHash="0FBE11FE0E084B3A3A2542A0D3FA7161F113BEA5" CanActivate="false" IconIndex="1" Blueprint="ThisAddIn.Designer.xml" GeneratedCode="ThisAddIn.Designer.cs" />
    2.35          </Host>