Skip to content

Commit b5c4820

Browse files
MikeWilliams-UKMikeWilliams-UK
committed
Merged PR 408: V3.1.15 Release 5
Related work items: #754, #769, #770, #773, #774, #775
1 parent 18ce2b1 commit b5c4820

File tree

84 files changed

+3176
-1412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+3176
-1412
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
This project is Version 3.1 of the Chemistry for Word Add-In
33

44
## Getting Started
5-
1. Installation process see $/doc/Chem4Word-Version3-1-Developer-SetUp.docx
5+
1. Installation process see $/docs/Chem4Word-Version3-1-Developer-SetUp.docx
66
2. Software dependencies Office 2010/2013/2016/2019/365 (Installed on Desktop)
77
3. Latest releases
88

‎src/Chem4Word.V3-1.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chem4Word.Editor.ACME", "Pl
8686
EndProject
8787
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{53F5ADDD-80C3-4FE4-88A1-B04239474E4B}"
8888
ProjectSection(SolutionItems) = preProject
89+
Scripts\Clone-Setup-V2.ps1 = Scripts\Clone-Setup-V2.ps1
90+
Scripts\Clone-Setup-V3.ps1 = Scripts\Clone-Setup-V3.ps1
91+
Scripts\Clone-Setup-V31.ps1 = Scripts\Clone-Setup-V31.ps1
8992
Scripts\DeepClean.ps1 = Scripts\DeepClean.ps1
93+
Scripts\GetBackToSquareOne.ps1 = Scripts\GetBackToSquareOne.ps1
9094
Scripts\Install-Dev-Certificate.ps1 = Scripts\Install-Dev-Certificate.ps1
9195
Scripts\SetAssemblyVersion.ps1 = Scripts\SetAssemblyVersion.ps1
9296
Scripts\SignAssembly.ps1 = Scripts\SignAssembly.ps1

‎src/Chem4Word.V3/Chem4WordV3.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -942,9 +942,9 @@ public void EnableContentControlEvents()
942942
EventsEnabled = true;
943943
}
944944
}
945-
catch (Exception exception)
945+
catch // (Exception exception)
946946
{
947-
RegistryHelper.StoreException(module, exception);
947+
// RegistryHelper.StoreException(module, exception)
948948
}
949949
}
950950

@@ -1007,9 +1007,9 @@ public void DisableContentControlEvents()
10071007
}
10081008
}
10091009
}
1010-
catch (Exception exception)
1010+
catch // (Exception exception)
10111011
{
1012-
RegistryHelper.StoreException(module, exception);
1012+
// RegistryHelper.StoreException(module, exception)
10131013
}
10141014
}
10151015

‎src/Chem4Word.V3/Data/Chem4Word-Versions.xml

Lines changed: 178 additions & 164 deletions
Large diffs are not rendered by default.

‎src/Chem4Word.V3/Data/This-Version.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Version>
3-
<Number>3.1.14 Release 4</Number>
4-
<IsBeta>false</IsBeta>
5-
<Released>30-Sep-2020</Released>
3+
<Number>3.1.15 Release 5</Number>
4+
<IsBeta>false</IsBeta>
5+
<Released>17-Oct-2020</Released>
66
</Version>

‎src/Chem4Word.V3/Data/index.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ <h1>Chemistry for Word Add-In 2020</h1>
1515
<td>Setup Bootstrapper</td>
1616
<td><a href="/files3-1/Chem4Word-Setup.exe">Chem4Word-Setup</a></td>
1717
</tr>
18+
<tr>
19+
<td>Version 3.1.15 - Release 5</td>
20+
<td><a href="/files3-1/Chem4Word-Setup.3.1.15.Release.5.msi">Chem4Word-Setup 3.1.15 Release 5</a></td>
21+
</tr>
1822
<tr>
1923
<td>Version 3.1.14 - Release 4</td>
20-
<td><a href="/files3-1/Chem4Word-Setup.3.1.14.Release.4.msi">Chem4Word-Setup 3.1.14 Release 4</a></td>
24+
<td>Chem4Word-Setup 3.1.14 Release 4</td>
2125
</tr>
2226
<tr>
2327
<td>Version 3.1.13 - Release 3</td>

‎src/Chem4Word.V3/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.1.14.7578")]
39-
[assembly: AssemblyFileVersion("3.1.14.7578")]
38+
[assembly: AssemblyVersion("3.1.15.7595")]
39+
[assembly: AssemblyFileVersion("3.1.15.7595")]

‎src/Chem4WordTests/Chem4WordTests.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<Compile Include="FunctionalGroupLoading.cs" />
116116
<Compile Include="Properties\AssemblyInfo.cs" />
117117
<Compile Include="ResourceHelper.cs" />
118+
<Compile Include="EditViewModel.cs" />
118119
</ItemGroup>
119120
<ItemGroup>
120121
<ProjectReference Include="..\Chemistry\Chem4Word.ACME\Chem4Word.ACME.csproj">
@@ -125,6 +126,10 @@
125126
<Project>{c69bab8f-4881-4d5f-9929-fc8470df1e48}</Project>
126127
<Name>Chem4Word.Model2</Name>
127128
</ProjectReference>
129+
<ProjectReference Include="..\PlugIns\Contracts\Chem4Word.Contracts.csproj">
130+
<Project>{BDFEE6C1-3F34-4200-9100-C543BF4C3783}</Project>
131+
<Name>Chem4Word.Contracts</Name>
132+
</ProjectReference>
128133
</ItemGroup>
129134
<ItemGroup>
130135
<EmbeddedResource Include="ControlTestForm.resx">
@@ -161,6 +166,7 @@
161166
<None Include="packages.config">
162167
<SubType>Designer</SubType>
163168
</None>
169+
<EmbeddedResource Include="Resources\CML\cyclohexylidenecyclohexane.xml" />
164170
</ItemGroup>
165171
<ItemGroup>
166172
<EmbeddedResource Include="Resources\CML\NestedMolecules.xml" />
@@ -198,6 +204,15 @@
198204
<ItemGroup>
199205
<EmbeddedResource Include="Resources\CML\Trimethylamine-MoleculeRoot.xml" />
200206
</ItemGroup>
207+
<ItemGroup>
208+
<EmbeddedResource Include="Resources\CML\Two-Molecules-With-Foliage.xml" />
209+
</ItemGroup>
210+
<ItemGroup>
211+
<EmbeddedResource Include="Resources\CML\Two-Molecules-For-Joining.xml" />
212+
</ItemGroup>
213+
<ItemGroup>
214+
<EmbeddedResource Include="Resources\CML\Two-Grouped-Molecules.xml" />
215+
</ItemGroup>
201216
<Choose>
202217
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
203218
<ItemGroup>

0 commit comments

Comments
 (0)