Skip to content

Commit ed07056

Browse files
...
1 parent edf13b3 commit ed07056

31 files changed

+179
-162
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,6 @@ ModelManifest.xml
247247
/Binaries/UWP
248248
/Interception/Cauldron.Interception.Fody/Tools/Cauldron.Interception.Fody.99.9.9
249249
/Tools/Cauldron.Interception.Fody.99.9.9
250+
/NetStandard/Tools/Cauldron.Interception.Fody.99.9.9
251+
/UWP/Tools/Cauldron.Interception.Fody.99.9.9
252+
/Win32/Tools/Cauldron.Interception.Fody.99.9.9

Fody/Cauldron.Interception.Fody/Cauldron.Interception.Fody.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@
130130
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
131131
<PropertyGroup>
132132
<PostBuildEvent>dotnet script "$(ProjectDir)..\..\Scripts\fodycopy.csx" "$(TargetDir)" "$(ProjectDir)..\..\Tools" $(ProjectName)
133+
dotnet script "$(ProjectDir)..\..\Scripts\fodycopy.csx" "$(TargetDir)" "$(ProjectDir)..\..\NetStandard\Tools" $(ProjectName)
134+
dotnet script "$(ProjectDir)..\..\Scripts\fodycopy.csx" "$(TargetDir)" "$(ProjectDir)..\..\Win32\Tools" $(ProjectName)
135+
dotnet script "$(ProjectDir)..\..\Scripts\fodycopy.csx" "$(TargetDir)" "$(ProjectDir)..\..\UWP\Tools" $(ProjectName)
133136
dotnet script "$(ProjectDir)..\..\Scripts\fodycopy.csx" "$(TargetDir)" "$(ProjectDir)..\..\packages" $(ProjectName)</PostBuildEvent>
134137
</PropertyGroup>
135138
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Nuget/Capgemini.Cauldron.Activator.nuspec

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
</releaseNotes>
2020
<dependencies>
2121
<group targetFramework=".NETStandard2.0">
22-
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.33-beta" />
23-
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.33-beta" />
24-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
25-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
26-
<dependency id="Cauldron.Interception.Fody" version="2.0.33-beta" />
27-
<dependency id="Fody" id="Fody" version="2.3.22" />
22+
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.35-beta" />
23+
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.35-beta" />
24+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
25+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
26+
<dependency id="Cauldron.Interception.Fody" version="2.0.35-beta" />
27+
<dependency id="Fody" version="2.3.22" />
2828
</group>
2929
</dependencies>
3030
</metadata>

Nuget/Capgemini.Cauldron.Consoles.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<tags>Toolkit Capgemini Console Parameter Parsing Argument Arguments Parameters Cauldron Command CommandLine Args</tags>
1515
<dependencies>
1616
<group targetFramework=".NETStandard2.0">
17-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
18-
<dependency id="Capgemini.Cauldron.Core.Randomizer" version="2.0.33-beta" />
19-
<dependency id="Capgemini.Cauldron.Localization" version="2.0.33-beta" />
17+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
18+
<dependency id="Capgemini.Cauldron.Core.Randomizer" version="2.0.35-beta" />
19+
<dependency id="Capgemini.Cauldron.Localization" version="2.0.35-beta" />
2020
</group>
2121
</dependencies>
2222
</metadata>

Nuget/Capgemini.Cauldron.Core.Collections.nuspec

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
</releaseNotes>
1919
<dependencies>
2020
<group targetFramework=".NETStandard2.0">
21-
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.33-beta" />
22-
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.33-beta" />
23-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
24-
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.33-beta" />
21+
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.35-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
23+
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.35-beta" />
2524
</group>
2625
</dependencies>
2726
</metadata>

Nuget/Capgemini.Cauldron.Core.Extensions.Compression.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<tags>Toolkit Capgemini Cauldron Extensions Compression GZipStream GZip</tags>
1515
<dependencies>
1616
<group targetFramework=".NETStandard2.0">
17-
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.33-beta" />
17+
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.35-beta" />
1818
</group>
1919
</dependencies>
2020
</metadata>

Nuget/Capgemini.Cauldron.Core.Interceptors.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</releaseNotes>
2121
<dependencies>
2222
<group targetFramework=".NETStandard2.0">
23-
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.33-beta" />
24-
<dependency id="Cauldron.Interception.Fody" version="2.0.33-beta" />
25-
<dependency id="Fody" id="Fody" version="2.3.22" />
23+
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.35-beta" />
24+
<dependency id="Cauldron.Interception.Fody" version="2.0.35-beta" />
25+
<dependency id="Fody" version="2.3.22" />
2626
</group>
2727
</dependencies>
2828
</metadata>

Nuget/Capgemini.Cauldron.Core.JavaProperties.nuspec

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<file src="..\NetStandard\Cauldron.Core.JavaProperties\bin\Release\netstandard2.0\Cauldron.Core.JavaProperties.dll" target="lib\netstandard2.0\Cauldron.Core.JavaProperties.dll" />
2424
<file src="..\NetStandard\Cauldron.Core.JavaProperties\bin\Release\netstandard2.0\Cauldron.Core.JavaProperties.xml" target="lib\netstandard2.0\Cauldron.Core.JavaProperties.xml" />
2525
<file src="..\NetStandard\Cauldron.Core.JavaProperties\bin\Release\netstandard2.0\Cauldron.Core.JavaProperties.pdb" target="lib\netstandard2.0\Cauldron.Core.JavaProperties.pdb" />
26-
2726
<file src="..\NetStandard\Cauldron.Core.JavaProperties\**\*.cs" target="src" />
2827
</files>
2928
</package>

Nuget/Capgemini.Cauldron.Core.MathExtensions.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<tags>Toolkit Capgemini Math</tags>
1515
<dependencies>
1616
<group targetFramework=".NETStandard2.0">
17-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
17+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
1818
</group>
1919
</dependencies>
2020
</metadata>

Nuget/Capgemini.Cauldron.Core.Reflection.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</releaseNotes>
2828
<dependencies>
2929
<group targetFramework=".NETStandard2.0">
30-
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.33-beta" />
30+
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.35-beta" />
3131
</group>
3232
</dependencies>
3333
</metadata>

Nuget/Capgemini.Cauldron.Core.Threading.nuspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
</releaseNotes>
1818
<dependencies>
1919
<group targetFramework=".NETStandard2.0">
20-
<dependency id="Capgemini.Cauldron.Activator" version="2.0.33-beta" />
21-
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.33-beta" />
22-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
23-
<dependency id="Fody" id="Fody" version="2.3.22" exclude="Build,Analyzers" />
20+
<dependency id="Capgemini.Cauldron.Activator" version="2.0.35-beta" />
21+
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.35-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
23+
<dependency id="Fody" version="2.3.22" exclude="Build,Analyzers" />
2424
</group>
2525
</dependencies>
2626
</metadata>

Nuget/Capgemini.Cauldron.Core.Yaml.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<tags>Toolkit Capgemini Cauldron Yaml</tags>
1515
<dependencies>
1616
<group targetFramework=".NETStandard2.0">
17-
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.33-beta" />
18-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
17+
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.35-beta" />
18+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
1919
</group>
2020
</dependencies>
2121
</metadata>

Nuget/Capgemini.Cauldron.Core.nuspec

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
</releaseNotes>
1919
<dependencies>
2020
<group targetFramework=".NETStandard2.0">
21-
<dependency id="Capgemini.Cauldron.Core.Collections" version="2.0.33-beta" />
22-
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.33-beta" />
23-
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.33-beta" />
24-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
25-
<dependency id="Capgemini.Cauldron.Core.Extensions.IO" version="2.0.33-beta" />
26-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
21+
<dependency id="Capgemini.Cauldron.Core.Collections" version="2.0.35-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.35-beta" />
23+
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.35-beta" />
24+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
25+
<dependency id="Capgemini.Cauldron.Core.Extensions.IO" version="2.0.35-beta" />
26+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
2727
<dependency id="Newtonsoft.Json" version="10.0.3" />
2828
</group>
2929
</dependencies>

Nuget/Capgemini.Cauldron.Cryptography.nuspec

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<tags>Toolkit Capgemini Cauldron Cryptography AES RSA SecureString</tags>
1515
<dependencies>
1616
<group targetFramework=".NETStandard2.0">
17-
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.33-beta" />
18-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
19-
<dependency id="Capgemini.Cauldron.Core.Extensions.Compression" version="2.0.33-beta" />
20-
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.33-beta" />
21-
<dependency id="Capgemini.Cauldron.Core.MathExtensions" version="2.0.33-beta" />
22-
<dependency id="Capgemini.Cauldron.Core.Randomizer" version="2.0.33-beta" />
17+
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.35-beta" />
18+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
19+
<dependency id="Capgemini.Cauldron.Core.Extensions.Compression" version="2.0.35-beta" />
20+
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.35-beta" />
21+
<dependency id="Capgemini.Cauldron.Core.MathExtensions" version="2.0.35-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Randomizer" version="2.0.35-beta" />
2323
</group>
2424
</dependencies>
2525
</metadata>

Nuget/Capgemini.Cauldron.Localization.nuspec

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
</releaseNotes>
1818
<dependencies>
1919
<group targetFramework=".NETStandard2.0">
20-
<dependency id="Capgemini.Cauldron.Activator" version="2.0.33-beta" />
21-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
22-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
23-
<dependency id="Capgemini.Cauldron.Core.Yaml" version="2.0.33-beta" />
20+
<dependency id="Capgemini.Cauldron.Activator" version="2.0.35-beta" />
21+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
23+
<dependency id="Capgemini.Cauldron.Core.Yaml" version="2.0.35-beta" />
2424
<dependency id="Newtonsoft.Json" version="10.0.3" />
25-
<dependency id="Fody" id="Fody" version="2.3.22" />
25+
<dependency id="Fody" version="2.3.22" />
2626
</group>
2727
</dependencies>
2828
</metadata>

Nuget/Capgemini.Cauldron.Win32.Extension.IO.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<copyright>Copyright (c) 2016 Capgemini Deutschland GmbH</copyright>
1515
<tags>Toolkit Capgemini Cauldron IO</tags>
1616
<dependencies>
17-
<dependency id="Capgemini.Cauldron.Core.Extensions.IO" version="2.0.33-beta" />
17+
<dependency id="Capgemini.Cauldron.Core.Extensions.IO" version="2.0.35-beta" />
1818
</dependencies>
1919
</metadata>
2020
<files>

Nuget/Capgemini.Cauldron.Win32.Interceptors.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
2017.12.04 - [C] TimedCacheAttribute namespace changed to Cauldron.Core.Interceptors.
2525
</releaseNotes>
2626
<dependencies>
27-
<dependency id="Cauldron.Interception.Fody" version="2.0.33-beta" />
28-
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.33-beta" />
29-
<dependency id="Fody" id="Fody" version="2.3.22" />
27+
<dependency id="Cauldron.Interception.Fody" version="2.0.35-beta" />
28+
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.35-beta" />
29+
<dependency id="Fody" version="2.3.22" />
3030
<dependency id="NLog" version="4.4.12" />
3131
</dependencies>
3232
<frameworkAssemblies>

Nuget/Capgemini.Cauldron.Win32.Net.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2017.12.22 - [C] Elevated Urlprotocol now also passes the uri
2020
</releaseNotes>
2121
<dependencies>
22-
<dependency id="Capgemini.Cauldron.Core.Net" version="2.0.33-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Net" version="2.0.35-beta" />
2323
</dependencies>
2424
</metadata>
2525
<files>

Nuget/Capgemini.Cauldron.Win32.Threading.nuspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<copyright>Copyright (c) 2016 Capgemini Deutschland GmbH</copyright>
1616
<tags>Toolkit Capgemini Cauldron Dispatcher</tags>
1717
<dependencies>
18-
<dependency id="Capgemini.Cauldron.Activator" version="2.0.33-beta" />
19-
<dependency id="Capgemini.Cauldron.Core.Threading" version="2.0.33-beta" />
20-
<dependency id="Fody" id="Fody" version="2.3.22" />
21-
<dependency id="Cauldron.Interception.Fody" version="2.0.33-beta" />
18+
<dependency id="Capgemini.Cauldron.Activator" version="2.0.35-beta" />
19+
<dependency id="Capgemini.Cauldron.Core.Threading" version="2.0.35-beta" />
20+
<dependency id="Fody" version="2.3.22" />
21+
<dependency id="Cauldron.Interception.Fody" version="2.0.35-beta" />
2222
</dependencies>
2323
<frameworkAssemblies>
2424
<frameworkAssembly assemblyName="WindowsBase" />

Nuget/Capgemini.Cauldron.Win32.UserInformation.nuspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
2017.12.19 - [A] WTSClientName added to User and CurrentUser. WTSClientName returns the Windows Terminal Session client name.
2020
</releaseNotes>
2121
<dependencies>
22-
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.33-beta" />
23-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
24-
<dependency id="Capgemini.Cauldron.Core.Net" version="2.0.33-beta" />
25-
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.33-beta" />
22+
<dependency id="Capgemini.Cauldron.Core.Comparing" version="2.0.35-beta" />
23+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
24+
<dependency id="Capgemini.Cauldron.Core.Net" version="2.0.35-beta" />
25+
<dependency id="Capgemini.Cauldron.Core.Extensions.Convertions" version="2.0.35-beta" />
2626
</dependencies>
2727
<frameworkAssemblies>
2828
<frameworkAssembly assemblyName="System.DirectoryServices" />

Nuget/Capgemini.Cauldron.Win32.WPF.Interactivity.nuspec

+13-13
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
2017.12.10 - [B] The "Localized" attached property will not continue loading if in design mode to avoid those weird errors in the WPF editor
1919
</releaseNotes>
2020
<dependencies>
21-
<dependency id="Fody" id="Fody" version="2.3.22" />
21+
<dependency id="Fody" version="2.3.22" />
2222
<dependency id="Newtonsoft.Json" version="10.0.3" />
2323
<dependency id="PropertyChanged.Fody" version="2.2.4" />
24-
<dependency id="Cauldron.Interception.Fody" version="2.0.33-beta" />
25-
<dependency id="Capgemini.Cauldron.Activator" version="2.0.33-beta" />
26-
<dependency id="Capgemini.Cauldron.Core.Collections" version="2.0.33-beta" />
27-
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.33-beta" />
28-
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.33-beta" />
29-
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.33-beta" />
30-
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.33-beta" />
31-
<dependency id="Capgemini.Cauldron.Core.Threading" version="2.0.33-beta" />
32-
<dependency id="Capgemini.Cauldron.Cryptography" version="2.0.33-beta" />
33-
<dependency id="Capgemini.Cauldron.Localization" version="2.0.33-beta" />
34-
<dependency id="Capgemini.Cauldron.Win32.Threading" version="2.0.33-beta" />
35-
<dependency id="Capgemini.Cauldron.Win32.WPF" version="2.0.33-beta" />
24+
<dependency id="Cauldron.Interception.Fody" version="2.0.35-beta" />
25+
<dependency id="Capgemini.Cauldron.Activator" version="2.0.35-beta" />
26+
<dependency id="Capgemini.Cauldron.Core.Collections" version="2.0.35-beta" />
27+
<dependency id="Capgemini.Cauldron.Core.Diagnostics" version="2.0.35-beta" />
28+
<dependency id="Capgemini.Cauldron.Core.Disposable" version="2.0.35-beta" />
29+
<dependency id="Capgemini.Cauldron.Core.Extensions" version="2.0.35-beta" />
30+
<dependency id="Capgemini.Cauldron.Core.Reflection" version="2.0.35-beta" />
31+
<dependency id="Capgemini.Cauldron.Core.Threading" version="2.0.35-beta" />
32+
<dependency id="Capgemini.Cauldron.Cryptography" version="2.0.35-beta" />
33+
<dependency id="Capgemini.Cauldron.Localization" version="2.0.35-beta" />
34+
<dependency id="Capgemini.Cauldron.Win32.Threading" version="2.0.35-beta" />
35+
<dependency id="Capgemini.Cauldron.Win32.WPF" version="2.0.35-beta" />
3636
</dependencies>
3737
</metadata>
3838
<files>

Nuget/Capgemini.Cauldron.Win32.WPF.ParameterPassing.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2017.12.21 - [C] Now uses the NET461 assembly version of the randomizer.
2121
</releaseNotes>
2222
<dependencies>
23-
<dependency id="Capgemini.Cauldron.Core.Randomizer" version="2.0.33-beta" />
23+
<dependency id="Capgemini.Cauldron.Core.Randomizer" version="2.0.35-beta" />
2424
</dependencies>
2525
<frameworkAssemblies>
2626
<frameworkAssembly assemblyName="PresentationCore" />

0 commit comments

Comments
 (0)