Skip to content

Commit a73d934

Browse files
ryannewingtonryannewington
committed
Fixes an issue with a NullReferenceException occurring in a StringEscapeTransform
1 parent e80315c commit a73d934

File tree

9 files changed

+18
-13
lines changed

9 files changed

+18
-13
lines changed

‎src/Lithnet.Acma.Installer/Lithnet.Acma.PS.Binaries.wxs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<Component Id="cmp49DA527C678D2851A592C8026C8D1979" Guid="*">
1616
<File Id="filEEA1D038C48579E2C970A3CBD689326B" KeyPath="yes" Source="$(var.Lithnet.Acma.PS.TargetDir)\Lithnet.Acma.PS.dll" />
1717
</Component>
18+
<Component Id="cmp43DBE65792C2B6FFB3A6C09E94B74461" Guid="*">
19+
<File Id="fil18F7DECB317BF7086D3484C0900E71CE" KeyPath="yes" Source="$(var.Lithnet.Acma.PS.TargetDir)\Lithnet.Acma.PS.dll.config" />
20+
</Component>
1821
<Component Id="cmpACB7E05865E9B807C9559543D51E9F74" Guid="*">
1922
<File Id="fil3DFA800FB89E0974549972EDCF7E2806" KeyPath="yes" Source="$(var.Lithnet.Acma.PS.TargetDir)\Lithnet.Acma.PS.pdb" />
2023
</Component>
@@ -69,6 +72,7 @@
6972
<ComponentRef Id="cmp6F8B4A1127364EEBC4CDFB20B54EEB29" />
7073
<ComponentRef Id="cmp6B4753083F6AFB83AAFE8E55C5C39CA8" />
7174
<ComponentRef Id="cmp49DA527C678D2851A592C8026C8D1979" />
75+
<ComponentRef Id="cmp43DBE65792C2B6FFB3A6C09E94B74461" />
7276
<ComponentRef Id="cmpACB7E05865E9B807C9559543D51E9F74" />
7377
<ComponentRef Id="cmp02E7FF3A6AEAE90A3A13E7791EF29F75" />
7478
<ComponentRef Id="cmp68C24401ECD8692CB1BBF3723546C708" />

‎src/Lithnet.Acma.PS/Lithnet.Acma.PS.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
<Content Include="AcmaPS.psd1">
158158
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
159159
</Content>
160+
<None Include="app.config" />
160161
<None Include="FodyWeavers.xml" />
161162
<None Include="packages.config" />
162163
<Content Include="RegisterResolver.ps1">

‎src/Lithnet.Acma.Presentation/Lithnet.Acma.Presentation.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@
322322
<HintPath>..\packages\Lithnet.MetadirectoryServices.1.0.6017.24789\lib\net40\Lithnet.MetadirectoryServices.dll</HintPath>
323323
<Private>True</Private>
324324
</Reference>
325-
<Reference Include="Lithnet.Transforms, Version=1.5.6017.25693, Culture=neutral, processorArchitecture=MSIL">
326-
<HintPath>..\packages\Lithnet.Transforms.1.5.6017.25693\lib\net40\Lithnet.Transforms.dll</HintPath>
325+
<Reference Include="Lithnet.Transforms, Version=1.5.6057.28725, Culture=neutral, processorArchitecture=MSIL">
326+
<HintPath>..\packages\Lithnet.Transforms.1.5.6057.28725\lib\net45\Lithnet.Transforms.dll</HintPath>
327327
<Private>True</Private>
328328
</Reference>
329-
<Reference Include="Lithnet.Transforms.Presentation, Version=1.5.6017.25705, Culture=neutral, processorArchitecture=MSIL">
330-
<HintPath>..\packages\Lithnet.Transforms.Presentation.1.5.6017.25705\lib\net40\Lithnet.Transforms.Presentation.dll</HintPath>
329+
<Reference Include="Lithnet.Transforms.Presentation, Version=1.5.6057.28947, Culture=neutral, processorArchitecture=MSIL">
330+
<HintPath>..\packages\Lithnet.Transforms.Presentation.1.5.6057.28947\lib\net45\Lithnet.Transforms.Presentation.dll</HintPath>
331331
<Private>True</Private>
332332
</Reference>
333333
<Reference Include="Microsoft.CSharp">

‎src/Lithnet.Acma.Presentation/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<package id="Lithnet.Common.Presentation" version="1.0.5777.18976" targetFramework="net40" />
88
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
99
<package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
10-
<package id="Lithnet.Transforms" version="1.5.6017.25693" targetFramework="net40" />
11-
<package id="Lithnet.Transforms.Presentation" version="1.5.6017.25705" targetFramework="net40" />
10+
<package id="Lithnet.Transforms" version="1.5.6057.28725" targetFramework="net45" />
11+
<package id="Lithnet.Transforms.Presentation" version="1.5.6057.28947" targetFramework="net45" />
1212
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
1313
<package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net40" />
1414
</packages>

‎src/Lithnet.Acma.UnitTests/Lithnet.Acma.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<HintPath>..\packages\Lithnet.MetadirectoryServices.Resolver.1.0.6006.11723\lib\net40\Lithnet.MetadirectoryServices.Resolver.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="Lithnet.Transforms, Version=1.5.6017.25693, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Lithnet.Transforms.1.5.6017.25693\lib\net40\Lithnet.Transforms.dll</HintPath>
60+
<Reference Include="Lithnet.Transforms, Version=1.5.6057.28725, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Lithnet.Transforms.1.5.6057.28725\lib\net45\Lithnet.Transforms.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
6464
<Reference Include="Microsoft.MetadirectoryServicesEx">

‎src/Lithnet.Acma.UnitTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
66
<package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
77
<package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
8-
<package id="Lithnet.Transforms" version="1.5.6017.25693" targetFramework="net40" />
8+
<package id="Lithnet.Transforms" version="1.5.6057.28725" targetFramework="net45" />
99
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
1010
</packages>

‎src/Lithnet.Acma/DataModel/MAObjectHologram.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ private MAObjectHologram UndeleteShadowObject(AcmaSchemaShadowObjectLink link, G
14401440
/// </summary>
14411441
private void DereferenceShadowParent()
14421442
{
1443-
if (this.ShadowParentID != Guid.Empty)
1443+
if (this.ShadowParent != null)
14441444
{
14451445
if (this.ShadowLink != null)
14461446
{

‎src/Lithnet.Acma/Lithnet.Acma.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
<HintPath>..\packages\Lithnet.MetadirectoryServices.1.0.6017.24789\lib\net40\Lithnet.MetadirectoryServices.dll</HintPath>
9292
<Private>True</Private>
9393
</Reference>
94-
<Reference Include="Lithnet.Transforms, Version=1.5.6017.25693, Culture=neutral, processorArchitecture=MSIL">
95-
<HintPath>..\packages\Lithnet.Transforms.1.5.6017.25693\lib\net40\Lithnet.Transforms.dll</HintPath>
94+
<Reference Include="Lithnet.Transforms, Version=1.5.6057.28725, Culture=neutral, processorArchitecture=MSIL">
95+
<HintPath>..\packages\Lithnet.Transforms.1.5.6057.28725\lib\net45\Lithnet.Transforms.dll</HintPath>
9696
<Private>True</Private>
9797
</Reference>
9898
<Reference Include="Microsoft.MetadirectoryServicesEx, Version=4.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Lithnet.Acma/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
55
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
66
<package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
7-
<package id="Lithnet.Transforms" version="1.5.6017.25693" targetFramework="net40" />
7+
<package id="Lithnet.Transforms" version="1.5.6057.28725" targetFramework="net45" />
88
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
99
</packages>

0 commit comments

Comments
 (0)