Skip to content

Commit a492dc5

Browse files
ryannewingtonryannewington
authored
Merge pull request #7 from lithnet/wcf-schema
Updates transform engine to fix non-rfc compliant DN escaping (https:…
2 parents c7d459c + 1f9950f commit a492dc5

File tree

23 files changed

+263
-167
lines changed

23 files changed

+263
-167
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<SccLocalPath>SAK</SccLocalPath>
1616
<SccAuxPath>SAK</SccAuxPath>
1717
<SccProvider>SAK</SccProvider>
18-
<NuGetPackageImportStamp>a386f267</NuGetPackageImportStamp>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1920
<TargetFrameworkProfile />
2021
</PropertyGroup>
2122
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,7 +52,7 @@
5152
<Private>False</Private>
5253
</Reference>
5354
<Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
54-
<HintPath>..\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
55+
<HintPath>..\packages\PropertyChanged.Fody.1.51.3\lib\dotnet\PropertyChanged.dll</HintPath>
5556
<Private>False</Private>
5657
</Reference>
5758
<Reference Include="System" />
@@ -103,13 +104,6 @@ copy /Y $(ProjectDir)obj\$(ConfigurationName)\$(TargetName).pdb $(TargetDir)$(Ta
103104
"C:\Program Files\Microsoft Forefront Identity Manager\2010\Synchronization Service\Bin\mapackager.exe" /e:$(ProjectDir)ExportedMA.xml /c:$(ProjectDir)MAPackageInformation.xml /o:$(ProjectDir)Lithnet.Acma.PackagedMA.xml
104105
REM "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\gacutil" -i "C:\Program Files\Microsoft ForeFront Identity Manager\2010\Synchronization Service\Bin\Assemblies\Microsoft.MetaDirectoryServicesEx.dll"</PreBuildEvent>
105106
</PropertyGroup>
106-
<Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
107-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
108-
<PropertyGroup>
109-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
110-
</PropertyGroup>
111-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
112-
</Target>
113107
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
114108
<ParameterGroup>
115109
<Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
@@ -146,6 +140,13 @@ foreach (var item in filesToCleanup)
146140
<Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
147141
<CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
148142
</Target>
143+
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
144+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
145+
<PropertyGroup>
146+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
147+
</PropertyGroup>
148+
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
149+
</Target>
149150
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
150151
Other similar extension points exist, see Microsoft.Common.targets.
151152
<Target Name="BeforeBuild">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net40" />
4-
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
4+
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
55
<package id="ILMerge" version="2.14.1208" targetFramework="net40" />
66
<package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
77
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
88
<package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
9-
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
9+
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net45" developmentDependency="true" />
1010
</packages>

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<SccLocalPath>SAK</SccLocalPath>
1818
<SccAuxPath>SAK</SccAuxPath>
1919
<SccProvider>SAK</SccProvider>
20-
<NuGetPackageImportStamp>0fc8a404</NuGetPackageImportStamp>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
2122
<AllowedReferenceRelatedFileExtensions>
2223
<!-- Prevent default XML and PDB files copied to output in RELEASE.
2324
Only *.allowedextension files will be included, which doesn't exist in my case.
@@ -76,7 +77,7 @@
7677
<Private>False</Private>
7778
</Reference>
7879
<Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
79-
<HintPath>..\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
80+
<HintPath>..\packages\PropertyChanged.Fody.1.51.3\lib\dotnet\PropertyChanged.dll</HintPath>
8081
<Private>False</Private>
8182
</Reference>
8283
<Reference Include="System" />
@@ -169,16 +170,16 @@
169170
<Resource Include="FodyWeavers.xml" />
170171
</ItemGroup>
171172
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
172-
<Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
173+
<PropertyGroup>
174+
<PostBuildEvent>"C:\Program Files (x86)\WiX Toolset v3.10\bin\heat.exe" dir "$(TargetDir)." -var var.$(TargetName).TargetDir -dr APPROOT -cg $(TargetName).Binaries -ag -scom -sreg -sfrag –srd -o "$(SolutionDir)$(SolutionName).Installer\$(ProjectName).Binaries.wxs"</PostBuildEvent>
175+
</PropertyGroup>
176+
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
173177
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
174178
<PropertyGroup>
175-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
179+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
176180
</PropertyGroup>
177-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
181+
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
178182
</Target>
179-
<PropertyGroup>
180-
<PostBuildEvent>"C:\Program Files (x86)\WiX Toolset v3.10\bin\heat.exe" dir "$(TargetDir)." -var var.$(TargetName).TargetDir -dr APPROOT -cg $(TargetName).Binaries -ag -scom -sreg -sfrag –srd -o "$(SolutionDir)$(SolutionName).Installer\$(ProjectName).Binaries.wxs"</PostBuildEvent>
181-
</PropertyGroup>
182183
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
183184
Other similar extension points exist, see Microsoft.Common.targets.
184185
<Target Name="BeforeBuild">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
3+
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
44
<package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
55
<package id="Lithnet.Common.Presentation" version="1.0.5777.18976" targetFramework="net40" />
66
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
77
<package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
8-
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
8+
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net45" developmentDependency="true" />
99
<package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net40" />
1010
</packages>

‎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.Installer/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Product Id="*"
55
Name="Lithnet ACMA"
66
Language="1033"
7-
Version="1.1.6087"
7+
Version="!(bind.FileVersion.fil03EEA0973F13C24D418250925B85FC46)"
88
Manufacturer="Lithnet"
99
UpgradeCode="bcb559bd-8b3a-4a77-9d30-df3fa44b7a13">
1010

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
<SccAuxPath>SAK</SccAuxPath>
1717
<SccProvider>SAK</SccProvider>
1818
<TargetFrameworkProfile />
19-
<NuGetPackageImportStamp>8681bf46</NuGetPackageImportStamp>
19+
<NuGetPackageImportStamp>
20+
</NuGetPackageImportStamp>
2021
</PropertyGroup>
2122
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2223
<DebugSymbols>true</DebugSymbols>
@@ -86,14 +87,14 @@
8687
<Private>False</Private>
8788
</Reference>
8889
<Reference Include="PropertyChanged, Version=1.51.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
89-
<HintPath>..\packages\PropertyChanged.Fody.1.51.3\lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
90+
<HintPath>..\packages\PropertyChanged.Fody.1.51.3\lib\dotnet\PropertyChanged.dll</HintPath>
9091
<Private>False</Private>
9192
</Reference>
9293
<Reference Include="System" />
9394
<Reference Include="System.Configuration.Install" />
9495
<Reference Include="System.Core" />
9596
<Reference Include="System.Management.Automation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\packages\System.Management.Automation.6.1.7601.17515\lib\net40\System.Management.Automation.dll</HintPath>
97+
<HintPath>..\packages\System.Management.Automation.6.1.7601.17515\lib\net45\System.Management.Automation.dll</HintPath>
9798
<Private>True</Private>
9899
</Reference>
99100
<Reference Include="System.Runtime.Serialization" />
@@ -157,6 +158,7 @@
157158
<Content Include="AcmaPS.psd1">
158159
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
159160
</Content>
161+
<None Include="app.config" />
160162
<None Include="FodyWeavers.xml" />
161163
<None Include="packages.config" />
162164
<Content Include="RegisterResolver.ps1">
@@ -174,13 +176,6 @@
174176
</ProjectReference>
175177
</ItemGroup>
176178
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
177-
<Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
178-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
179-
<PropertyGroup>
180-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
181-
</PropertyGroup>
182-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
183-
</Target>
184179
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
185180
<ParameterGroup>
186181
<Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
@@ -220,6 +215,13 @@ foreach (var item in filesToCleanup)
220215
<PropertyGroup>
221216
<PostBuildEvent>"C:\Program Files (x86)\WiX Toolset v3.10\bin\heat.exe" dir "$(TargetDir)." -var var.$(TargetName).TargetDir -dr APPROOT -cg $(TargetName).Binaries -ag -scom -sreg -sfrag –srd -o "$(SolutionDir)$(SolutionName).Installer\$(ProjectName).Binaries.wxs"</PostBuildEvent>
222217
</PropertyGroup>
218+
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
219+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
220+
<PropertyGroup>
221+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
222+
</PropertyGroup>
223+
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
224+
</Target>
223225
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
224226
Other similar extension points exist, see Microsoft.Common.targets.
225227
<Target Name="BeforeBuild">

‎src/Lithnet.Acma.PS/ShadowObjectLink/AddAcmaShadowObjectLink.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected override void ProcessRecord()
5959
AcmaSchemaAttribute referenceAttribute = ActiveConfig.DB.GetAttribute(this.ReferenceAttribute, parentClass);
6060

6161
ActiveConfig.DB.CreateShadowLink(shadowClass, provisioningAttribute, referenceAttribute, this.Name);
62-
ActiveConfig.DB.ClearCache();
62+
// ActiveConfig.DB.ClearCache();
6363

6464
}
6565
catch (Exception ex)

‎src/Lithnet.Acma.PS/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.Management.Automation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
3+
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
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" />
77
<package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
8-
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
9-
<package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net40" requireReinstallation="true" />
8+
<package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net45" developmentDependency="true" />
9+
<package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net45" />
1010
</packages>

0 commit comments

Comments
 (0)