Skip to content

Commit 40c1dd2

Browse files
npodbielskinpodbielski
committed
Merge branch 'develop'
Version incremented to 1.2.0
2 parents 3f9da66 + 49c66ae commit 40c1dd2

File tree

138 files changed

+8535
-31064
lines changed

Some content is hidden

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

138 files changed

+8535
-31064
lines changed

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ _ReSharper*/
2929
[Tt]est[Rr]esult*
3030
packages/**
3131
Nuget/lib
32-
Platforms/NETCore/DelegatesFactory/**/*.cs
33-
Platforms/NETCore/DelegatesTest/**/*.cs
34-
Platforms/NETStandard/DelegatesTest/**/*.cs
3532
**/project.fragment.lock.json
3633
**.nupkg
34+
.vs/**

‎Delegates.sln‎

Lines changed: 180 additions & 82 deletions
Large diffs are not rendered by default.

‎Delegates.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String></wpf:ResourceDictionary>

‎Delegates_NET46.sln‎

Lines changed: 0 additions & 286 deletions
This file was deleted.

‎Nuget/Nuget.nuspec‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<package >
33
<metadata>
4-
<id>DelegatesFactory</id>
5-
<version>1.1.0</version>
6-
<title>DelegatesFactory</title>
4+
<id>$id$</id>
5+
<version>1.1.0.0</version>
6+
<title>$id$</title>
77
<authors>npodbielski</authors>
88
<owners>npodbielski</owners>
99
<description>
@@ -17,37 +17,23 @@
1717
</summary>
1818
<language>en-US</language>
1919
<projectUrl>https://github.com/npodbielski/Delegates</projectUrl>
20-
<iconUrl>http://internetexception.com/nuget/delegateFactoryIcon.png</iconUrl>
20+
<iconUrl>https://raw.githubusercontent.com/npodbielski/Delegates/master/Nuget/delegateFactoryIcon.png</iconUrl>
2121
<requireLicenseAcceptance>false</requireLicenseAcceptance>
2222
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
23-
<copyright>Copyright npodbielski 2017</copyright>
23+
<copyright>Copyright npodbielski 2018</copyright>
2424
<tags>reflection, delegates</tags>
2525
</metadata>
2626
<files>
27-
<file src="..\Platforms\NET35\DelegatesFactory\bin\Release\**.dll" target="lib\NET35" />
28-
<file src="..\Platforms\NET35\DelegatesFactory\bin\Release\**.pdb" target="lib\NET35" />
29-
<file src="..\Platforms\NET35\DelegatesFactory\bin\Release\**.xml" target="lib\NET35" />
30-
<file src="..\Platforms\NET4\DelegatesFactory\bin\Release\**.dll" target="lib\NET4" />
31-
<file src="..\Platforms\NET4\DelegatesFactory\bin\Release\**.pdb" target="lib\NET4" />
32-
<file src="..\Platforms\NET4\DelegatesFactory\bin\Release\**.xml" target="lib\NET4" />
33-
<file src="..\Platforms\NET45\DelegatesFactory\bin\Release\**.dll" target="lib\NET45" />
34-
<file src="..\Platforms\NET45\DelegatesFactory\bin\Release\**.pdb" target="lib\NET45" />
35-
<file src="..\Platforms\NET45\DelegatesFactory\bin\Release\**.xml" target="lib\NET45" />
36-
<file src="..\Platforms\NET46\DelegatesFactory\bin\Release\**.dll" target="lib\NET46" />
37-
<file src="..\Platforms\NET46\DelegatesFactory\bin\Release\**.pdb" target="lib\NET46" />
38-
<file src="..\Platforms\NET46\DelegatesFactory\bin\Release\**.xml" target="lib\NET46" />
39-
<file src="..\Platforms\NETCore\DelegatesFactory\bin\Release\netstandard1.6\**.dll" target="lib\NETCore" />
40-
<file src="..\Platforms\NETCore\DelegatesFactory\bin\Release\netstandard1.6\**.pdb" target="lib\NETCore" />
41-
<file src="..\Platforms\NETCore\DelegatesFactory\bin\Release\netstandard1.6\**.xml" target="lib\NETCore" />
42-
<file src="..\Platforms\NETPortable\DelegatesFactory\bin\Release\**.dll" target="lib\portable-net45+sl50+netcore45+wpa81+wp8" />
43-
<file src="..\Platforms\NETPortable\DelegatesFactory\bin\Release\**.pdb" target="lib\portable-net45+sl50+netcore45+wpa81+wp8" />
44-
<file src="..\Platforms\NETPortable\DelegatesFactory\bin\Release\**.xml" target="lib\portable-net45+sl50+netcore45+wpa81+wp8" />
45-
<file src="..\Platforms\NETStandard\DelegatesFactory\bin\Release\**.dll" target="lib\netstandard1.5" />
46-
<file src="..\Platforms\NETStandard\DelegatesFactory\bin\Release\**.pdb" target="lib\netstandard1.5" />
47-
<file src="..\Platforms\NETStandard\DelegatesFactory\bin\Release\**.xml" target="lib\netstandard1.5" />
48-
<file src="..\src\DelegatesFactory\CustomDelegates\**\*.cs" target="src\CustomDelegates" />
49-
<file src="..\src\DelegatesFactory\Extensions\**\*.cs" target="src\Extensions" />
50-
<file src="..\src\DelegatesFactory\Helper\**\*.cs" target="src\Helper" />
51-
<file src="..\src\DelegatesFactory\*.cs" target="src" />
27+
<file src="..\Platforms\NET35\$id$\bin\$Configuration$\**" target="lib\NET35" />
28+
<file src="..\Platforms\NET4\$id$\bin\$Configuration$\**" target="lib\NET4" />
29+
<file src="..\Platforms\NET45\$id$\bin\$Configuration$\**" target="lib\NET45" />
30+
<file src="..\Platforms\NET46\$id$\bin\$Configuration$\**" target="lib\NET46" />
31+
<file src="..\Platforms\NETCore10\$id$\bin\$Configuration$\**" target="lib" />
32+
<file src="..\Platforms\NETCore11\$id$\bin\$Configuration$\**" target="lib" />
33+
<file src="..\Platforms\NETCore20\$id$\bin\$Configuration$\**" target="lib" />
34+
<file src="..\Platforms\NETPortable\$id$\bin\$Configuration$\**" target="lib\portable-net45+sl50+netcore45+wpa81+wp8" />
35+
<file src="..\Platforms\NETStandard11\$id$\bin\$Configuration$\**" target="lib" />
36+
<file src="..\Platforms\NETStandard15\$id$\bin\$Configuration$\**" target="lib" />
37+
<file src="..\src\$id$\**" target="src" />
5238
</files>
5339
</package>

‎Nuget/pack-publish.bat‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Nuget/updateVersion.ps1‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#updates assemblies and nuget package version according to version from git
2+
$numberOfCommits = & 'C:\Program Files\git\bin\git.exe' rev-list origin/master..HEAD --count
3+
$branch = git rev-parse --abbrev-ref HEAD
4+
if ($branch -eq 'develop'){
5+
$semver = '-unstable'
6+
}
7+
else{
8+
$semver = ''
9+
}
10+
$content = Get-Content 'C:\Program Files (x86)\Jenkins\workspace\Delegates_Develop\src\Common\Common.props'
11+
#replace version
12+
$content = $content -replace "(.*\<version.*)\.(\d*)\<",('$1.'+$numberOfCommits+$semver+'<')
13+
#replace assembly version and file version
14+
$content = $content -replace "(.*(Assembly|File)Version.*)\.(\d*)",('$1.'+$numberOfCommits)
15+
#replace copyright date
16+
$content = $content -replace "(.*Copyright © npodbielski)\s(\d*)",('$1 '+(Get-Date).Year)
17+
Set-Content 'C:\Program Files (x86)\Jenkins\workspace\Delegates_Develop\src\Common\Common.props' $content
18+
19+
$content = Get-Content 'C:\Program Files (x86)\Jenkins\workspace\Delegates_Develop\src\Common\SolutionAssemblyInfo.cs'
20+
#replace assembly version and file version
21+
$content = $content -replace "(.*Version.*)\.(\d*)",('$1.'+$numberOfCommits)
22+
#replace copyright date
23+
$content = $content -replace "(.*Copyright © npodbielski)\s(\d*)",('$1 '+(Get-Date).Year)
24+
Set-Content 'C:\Program Files (x86)\Jenkins\workspace\Delegates_Develop\src\Common\SolutionAssemblyInfo.cs' $content
25+
26+
$content = Get-Content 'C:\Program Files (x86)\Jenkins\workspace\Delegates_Develop\Nuget\Nuget.nuspec'
27+
#replace version
28+
$content = $content -replace "(.*\<version.*)\.(\d*)\<",('$1.'+$numberOfCommits+$semver+'<')
29+
#replace copyright date
30+
$content = $content -replace "(.*Copyright © npodbielski)\s(\d*)",('$1 '+(Get-Date).Year)
31+
Set-Content 'C:\Program Files (x86)\Jenkins\workspace\Delegates_Develop\Nuget\Nuget.nuspec' $content

Platforms/NET35/DelegatesApp/DelegatesApp.csproj renamed to Platforms/NET35/DelegatesApp/DelegatesAppNET35.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
<None Include="App.config" />
5555
</ItemGroup>
5656
<ItemGroup>
57-
<ProjectReference Include="..\DelegatesTest\DelegatesTest.csproj">
57+
<ProjectReference Include="..\DelegatesTest\DelegatesTestNET35.csproj">
5858
<Project>{b26ba86d-3dc9-4d55-93de-68152849518d}</Project>
59-
<Name>DelegatesTest</Name>
59+
<Name>DelegatesTestNET35</Name>
6060
</ProjectReference>
61-
<ProjectReference Include="..\DelegatesFactory\DelegatesFactory.csproj">
61+
<ProjectReference Include="..\DelegatesFactory\DelegatesFactoryNET35.csproj">
6262
<Project>{a52068fe-a219-4fd3-a218-44960f877553}</Project>
63-
<Name>DelegatesFactory</Name>
63+
<Name>DelegatesFactoryNET35</Name>
6464
</ProjectReference>
6565
</ItemGroup>
6666
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Platforms/NET35/DelegatesFactory/DelegatesFactory.csproj renamed to Platforms/NET35/DelegatesFactory/DelegatesFactoryNET35.csproj

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,12 @@
8888
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventAdd.cs">
8989
<Link>DelegateFactory_EventAdd.cs</Link>
9090
</Compile>
91-
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventInvoke.cs">
92-
<Link>DelegateFactory_EventInvoke.cs</Link>
93-
</Compile>
9491
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_EventRemove.cs">
9592
<Link>DelegateFactory_EventRemove.cs</Link>
9693
</Compile>
9794
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_FieldGet.cs">
9895
<Link>DelegateFactory_FieldGet.cs</Link>
9996
</Compile>
100-
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_FieldSet.cs">
101-
<Link>DelegateFactory_FieldSet.cs</Link>
102-
</Compile>
10397
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_IndexerGet.cs">
10498
<Link>DelegateFactory_IndexerGet.cs</Link>
10599
</Compile>
@@ -121,9 +115,6 @@
121115
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_StaticFieldGet.cs">
122116
<Link>DelegateFactory_StaticFieldGet.cs</Link>
123117
</Compile>
124-
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_StaticFieldSet.cs">
125-
<Link>DelegateFactory_StaticFieldSet.cs</Link>
126-
</Compile>
127118
<Compile Include="..\..\..\src\DelegatesFactory\DelegateFactory_StaticGenericMethod.cs">
128119
<Link>DelegateFactory_StaticGenericMethod.cs</Link>
129120
</Compile>
@@ -160,6 +151,9 @@
160151
<Compile Include="..\..\..\src\DelegatesFactory\Helper\EventsHelper.cs">
161152
<Link>Helper\EventsHelper.cs</Link>
162153
</Compile>
154+
<Compile Include="..\..\..\src\DelegatesFactory\Helper\EventsHelper_NonPortable.cs">
155+
<Link>Helper\EventsHelper_NonPortable.cs</Link>
156+
</Compile>
163157
<Compile Include="..\..\..\src\DelegatesFactory\Helper\ParametersIndexes.cs">
164158
<Link>Helper\ParametersIndexes.cs</Link>
165159
</Compile>

Platforms/NET35/DelegatesTest/DelegatesTest.csproj renamed to Platforms/NET35/DelegatesTest/DelegatesTestNET35.csproj

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<OutputType>Library</OutputType>
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>DelegatesTest</RootNamespace>
10-
<AssemblyName>DelegatesTest</AssemblyName>
10+
<AssemblyName>DelegatesTestNET35</AssemblyName>
1111
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
1515
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
16-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
16+
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\TestAgent\Common7\IDE\ReferenceAssemblies\v2.0</ReferencePath>
1717
<IsCodedUITest>False</IsCodedUITest>
1818
<TestProjectType>UnitTest</TestProjectType>
1919
<TargetFrameworkProfile />
@@ -51,6 +51,12 @@
5151
</Otherwise>
5252
</Choose>
5353
<ItemGroup>
54+
<Compile Include="..\..\..\src\Common\SolutionAssemblyInfo.cs">
55+
<Link>Properties\SolutionAssemblyInfo.cs</Link>
56+
</Compile>
57+
<Compile Include="..\..\..\src\Common\DelegatesTestAssemblyInfo.cs">
58+
<Link>Properties\DelegatesTestAssemblyInfo.cs</Link>
59+
</Compile>
5460
<Compile Include="..\..\..\src\DelegatesTest\AssertHelper.cs">
5561
<Link>AssertHelper.cs</Link>
5662
</Compile>
@@ -60,18 +66,12 @@
6066
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Add.cs">
6167
<Link>DelegateFactoryTests_Events_Add.cs</Link>
6268
</Compile>
63-
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Invoke.cs">
64-
<Link>DelegateFactoryTests_Events_Invoke.cs</Link>
65-
</Compile>
6669
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Events_Remove.cs">
6770
<Link>DelegateFactoryTests_Events_Remove.cs</Link>
6871
</Compile>
6972
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Fields_GetValue.cs">
7073
<Link>DelegateFactoryTests_Fields_GetValue.cs</Link>
7174
</Compile>
72-
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Fields_SetValue.cs">
73-
<Link>DelegateFactoryTests_Fields_SetValue.cs</Link>
74-
</Compile>
7575
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_Indexers_Getters.cs">
7676
<Link>DelegateFactoryTests_Indexers_Getters.cs</Link>
7777
</Compile>
@@ -93,9 +93,6 @@
9393
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_StaticField_GetValue.cs">
9494
<Link>DelegateFactoryTests_StaticField_GetValue.cs</Link>
9595
</Compile>
96-
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_StaticField_SetValue.cs">
97-
<Link>DelegateFactoryTests_StaticField_SetValue.cs</Link>
98-
</Compile>
9996
<Compile Include="..\..\..\src\DelegatesTest\DelegateFactoryTests_StaticMethods.cs">
10097
<Link>DelegateFactoryTests_StaticMethods.cs</Link>
10198
</Compile>
@@ -147,18 +144,12 @@
147144
<Compile Include="..\..\..\src\DelegatesTest\TestObjects\TestStruct.cs">
148145
<Link>TestObjects\TestStruct.cs</Link>
149146
</Compile>
150-
<Compile Include="..\..\..\src\Common\SolutionAssemblyInfo.cs">
151-
<Link>Properties\SolutionAssemblyInfo.cs</Link>
152-
</Compile>
153-
<Compile Include="..\..\..\src\Common\DelegatesTestAssemblyInfo.cs">
154-
<Link>Properties\DelegatesTestAssemblyInfo.cs</Link>
155-
</Compile>
156147
<Compile Include="Properties\AssemblyInfo.cs" />
157148
</ItemGroup>
158149
<ItemGroup>
159-
<ProjectReference Include="..\DelegatesFactory\DelegatesFactory.csproj">
150+
<ProjectReference Include="..\DelegatesFactory\DelegatesFactoryNET35.csproj">
160151
<Project>{a52068fe-a219-4fd3-a218-44960f877553}</Project>
161-
<Name>DelegatesFactory</Name>
152+
<Name>DelegatesFactoryNET35</Name>
162153
</ProjectReference>
163154
</ItemGroup>
164155
<Choose>

0 commit comments

Comments
 (0)