Skip to content

Commit 90dee33

Browse files
author
Dimitri Enns
committed
Revert "Made the library compatible to .Net 4.5"
This reverts commit b7e8478. Signed-off-by: Dima Enns <[email protected]>
1 parent d656208 commit 90dee33

File tree

10 files changed

+56
-37
lines changed

10 files changed

+56
-37
lines changed

Sources/LambdaConverters.Deployment/LambdaConverters.Deployment.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>LambdaConverters.Deployment</RootNamespace>
1111
<AssemblyName>LambdaConverters.Deployment</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>

Sources/LambdaConverters.Deployment/LambdaConverters.nuspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<package>
33
<metadata>
4-
<id>LambdaConvertersAndCo</id>
4+
<id>LambdaConverters</id>
55
<version />
6-
<title>Lambda Converters and Co.</title>
7-
<authors>Michael Damatov, Yeah69</authors>
6+
<title>Lambda Converters</title>
7+
<authors>Michael Damatov</authors>
88
<summary>Strongly-typed lambda expressions as value converters</summary>
9-
<description>This is a forked version of the "Lambda Converters" framework from Michael Damatov (please see https://github.com/michael-damatov/lambda-converters). It extends its capabilities to "Lambda ValidationRules" and "Lambda DataTemplateSelectors". Besides that it decreases the required .Net version to 4.5, so broader range of project may use this library.</description>
10-
<projectUrl>https://github.com/Yeah69/lambda-converters</projectUrl>
9+
<description>The library allows to create IValueConverter and IMultiValueConverter objects with the most convenient syntax available, ideally, using the lambda expressions.</description>
10+
<projectUrl>https://github.com/michael-damatov/lambda-converters</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/michael-damatov/lambda-converters/master/Icon.png</iconUrl>
12-
<licenseUrl>https://github.com/Yeah69/lambda-converters/blob/master/LICENSE</licenseUrl>
12+
<licenseUrl>https://github.com/michael-damatov/lambda-converters/blob/master/LICENSE</licenseUrl>
1313
<tags>lambda expression converter wpf strongly typed value multi</tags>
1414
</metadata>
1515
<files />

Sources/LambdaConverters.Deployment/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static void UpdateNuspec([NotNull] string assemblyPath, [NotNull] string nuspecP
114114
Debug.Assert(fileVersionAttributeData.ConstructorArguments[0].Value is string);
115115
versionElement.Value = (string)fileVersionAttributeData.ConstructorArguments[0].Value;
116116

117-
const string target = @"lib\net45";
117+
const string target = @"lib\net46";
118118
nuspec.Root.Element("files")?
119119
.Add(
120120
new XElement("file", new XAttribute("src", assemblyPath), new XAttribute("target", target)),

Sources/LambdaConverters.Deployment/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/LambdaConverters.Deployment/app.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<applicationSettings>
99
<LambdaConverters.Deployment.Properties.Settings>
1010
<setting name="SnPath" serializeAs="String">
11-
<value>C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\sn.exe</value>
11+
<value>C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\sn.exe</value>
1212
</setting>
1313
</LambdaConverters.Deployment.Properties.Settings>
1414
</applicationSettings>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
15+
</configuration>

Sources/LambdaConverters.Wpf/EventSource.cs

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public static class Keywords
3232
Message = "The {0} is null, conversion result is a value according to the specified error strategy ({1}).",
3333
Level = EventLevel.Warning,
3434
Keywords = Keywords.Converters,
35-
Opcode = EventOpcode.Info
35+
Opcode = EventOpcode.Info,
36+
Channel = EventChannel.Operational
3637
)]
3738
public void MissingConvertFunction(
3839
string callback,
@@ -59,7 +60,8 @@ public void MissingConvertFunction(
5960
Message = "The {0} is null, back conversion result is a value according to the specified error strategy ({1}).",
6061
Level = EventLevel.Warning,
6162
Keywords = Keywords.Converters,
62-
Opcode = EventOpcode.Info
63+
Opcode = EventOpcode.Info,
64+
Channel = EventChannel.Operational
6365
)]
6466
public void MissingConvertBackFunction(
6567
string callback,
@@ -86,7 +88,8 @@ public void MissingConvertBackFunction(
8688
Message = "The requested target type ({0}) is not assignable from the specified output type ({1}), conversion result is a value according to the specified error strategy ({2}).",
8789
Level = EventLevel.Warning,
8890
Keywords = Keywords.Converters,
89-
Opcode = EventOpcode.Info
91+
Opcode = EventOpcode.Info,
92+
Channel = EventChannel.Operational
9093
)]
9194
public void NonAssignableTargetType(
9295
string targetType,
@@ -115,7 +118,8 @@ public void NonAssignableTargetType(
115118
Message = "The requested target type ({0}) is not assignable from the specified input type ({1}), back conversion result is a value according to the specified error strategy ({2}).",
116119
Level = EventLevel.Warning,
117120
Keywords = Keywords.Converters,
118-
Opcode = EventOpcode.Info
121+
Opcode = EventOpcode.Info,
122+
Channel = EventChannel.Operational
119123
)]
120124
public void NonAssignableTargetTypeForBackConversion(
121125
string targetType,
@@ -144,7 +148,8 @@ public void NonAssignableTargetTypeForBackConversion(
144148
Message = "The requested target type ({0}) at the position {1} is not assignable from the specified input type ({2}), back conversion result is a value according to the specified error strategy ({3}).",
145149
Level = EventLevel.Warning,
146150
Keywords = Keywords.Converters,
147-
Opcode = EventOpcode.Info
151+
Opcode = EventOpcode.Info,
152+
Channel = EventChannel.Operational
148153
)]
149154
public void NonAssignableTargetTypeAtPositionForBackConversion(
150155
string targetType,
@@ -175,7 +180,8 @@ public void NonAssignableTargetTypeAtPositionForBackConversion(
175180
Message = "The provided values are null, conversion result is a value according to the specified error strategy ({0}).",
176181
Level = EventLevel.Warning,
177182
Keywords = Keywords.Converters,
178-
Opcode = EventOpcode.Info
183+
Opcode = EventOpcode.Info,
184+
Channel = EventChannel.Operational
179185
)]
180186
public void NullValues(
181187
string errorStrategy,
@@ -200,7 +206,8 @@ public void NullValues(
200206
Message = "The target type is not requested.",
201207
Level = EventLevel.Informational,
202208
Keywords = Keywords.Converters,
203-
Opcode = EventOpcode.Info
209+
Opcode = EventOpcode.Info,
210+
Channel = EventChannel.Operational
204211
)]
205212
public void NonRequestedTargetType(
206213
[CallerMemberName] string memberName = null,
@@ -223,7 +230,8 @@ public void NonRequestedTargetType(
223230
Message = "The target type at the position {0} is not requested.",
224231
Level = EventLevel.Informational,
225232
Keywords = Keywords.Converters,
226-
Opcode = EventOpcode.Info
233+
Opcode = EventOpcode.Info,
234+
Channel = EventChannel.Operational
227235
)]
228236
public void NonRequestedTargetTypeAtPosition(
229237
int position,
@@ -248,7 +256,8 @@ public void NonRequestedTargetTypeAtPosition(
248256
Message = "A conversion parameter ({0}) is provided, use the appropriate converter, conversion result is a value according to the specified error strategy ({1}).",
249257
Level = EventLevel.Warning,
250258
Keywords = Keywords.Converters,
251-
Opcode = EventOpcode.Info
259+
Opcode = EventOpcode.Info,
260+
Channel = EventChannel.Operational
252261
)]
253262
public void ParameterInParameterlessConverter(
254263
string objectType,
@@ -275,7 +284,8 @@ public void ParameterInParameterlessConverter(
275284
Message = "A conversion parameter ({0}) is provided, use the appropriate converter, back conversion result is a value according to the specified error strategy ({1}).",
276285
Level = EventLevel.Warning,
277286
Keywords = Keywords.Converters,
278-
Opcode = EventOpcode.Info
287+
Opcode = EventOpcode.Info,
288+
Channel = EventChannel.Operational
279289
)]
280290
public void ParameterInParameterlessConverterForBackConversion(
281291
string objectType,
@@ -302,7 +312,8 @@ public void ParameterInParameterlessConverterForBackConversion(
302312
Message = "The value ({0}) cannot be cast to the specified input type ({1}), conversion result is a value according to the specified error strategy ({2}).",
303313
Level = EventLevel.Warning,
304314
Keywords = Keywords.Converters,
305-
Opcode = EventOpcode.Info
315+
Opcode = EventOpcode.Info,
316+
Channel = EventChannel.Operational
306317
)]
307318
public void UnableToCastToInputType(
308319
string objectType,
@@ -331,7 +342,8 @@ public void UnableToCastToInputType(
331342
Message = "The value ({0}) at the position {1} cannot be cast to the specified input type ({2}), conversion result is a value according to the specified error strategy ({3}).",
332343
Level = EventLevel.Warning,
333344
Keywords = Keywords.Converters,
334-
Opcode = EventOpcode.Info
345+
Opcode = EventOpcode.Info,
346+
Channel = EventChannel.Operational
335347
)]
336348
public void UnableToCastAtPositionToInputType(
337349
string objectType,
@@ -362,7 +374,8 @@ public void UnableToCastAtPositionToInputType(
362374
Message = "The value ({0}) cannot be cast to the specified output type ({1}), back conversion result is a value according to the specified error strategy ({2}).",
363375
Level = EventLevel.Warning,
364376
Keywords = Keywords.Converters,
365-
Opcode = EventOpcode.Info
377+
Opcode = EventOpcode.Info,
378+
Channel = EventChannel.Operational
366379
)]
367380
public void UnableToCastToOutputType(
368381
string objectType,
@@ -391,7 +404,8 @@ public void UnableToCastToOutputType(
391404
Message = "The parameter value ({0}) cannot be cast to the specified parameter type ({1}), conversion result is a value according to the specified error strategy ({2}).",
392405
Level = EventLevel.Warning,
393406
Keywords = Keywords.Converters,
394-
Opcode = EventOpcode.Info
407+
Opcode = EventOpcode.Info,
408+
Channel = EventChannel.Operational
395409
)]
396410
public void UnableToCastToParameterType(
397411
string objectType,
@@ -420,7 +434,8 @@ public void UnableToCastToParameterType(
420434
Message = "The parameter value ({0}) cannot be cast to the specified parameter type ({1}), back conversion result is a value according to the specified error strategy ({2}).",
421435
Level = EventLevel.Warning,
422436
Keywords = Keywords.Converters,
423-
Opcode = EventOpcode.Info
437+
Opcode = EventOpcode.Info,
438+
Channel = EventChannel.Operational
424439
)]
425440
public void UnableToCastToParameterTypeForBackConversion(
426441
string objectType,
@@ -449,7 +464,8 @@ public void UnableToCastToParameterTypeForBackConversion(
449464
Message = "The {0} is null, conversion result is a value according to the specified error strategy ({1}).",
450465
Level = EventLevel.Warning,
451466
Keywords = Keywords.Selectors,
452-
Opcode = EventOpcode.Info
467+
Opcode = EventOpcode.Info,
468+
Channel = EventChannel.Operational
453469
)]
454470
public void MissingSelectTemplateFunction(
455471
string callback,
@@ -476,7 +492,8 @@ public void MissingSelectTemplateFunction(
476492
Message = "The value ({0}) cannot be cast to the specified input type ({1}), conversion result is a value according to the specified error strategy ({2}).",
477493
Level = EventLevel.Warning,
478494
Keywords = Keywords.Selectors,
479-
Opcode = EventOpcode.Info
495+
Opcode = EventOpcode.Info,
496+
Channel = EventChannel.Operational
480497
)]
481498
public void UnableToCastToItemType(
482499
string itemType,
@@ -505,7 +522,8 @@ public void UnableToCastToItemType(
505522
Message = "The {0} is null, conversion result is a value according to the specified error strategy ({1}).",
506523
Level = EventLevel.Warning,
507524
Keywords = Keywords.Rules,
508-
Opcode = EventOpcode.Info
525+
Opcode = EventOpcode.Info,
526+
Channel = EventChannel.Operational
509527
)]
510528
public void MissingRuleFunction(
511529
string callback,
@@ -532,7 +550,8 @@ public void MissingRuleFunction(
532550
Message = "The value ({0}) cannot be cast to the specified input type ({1}), conversion result is a value according to the specified error strategy ({2}).",
533551
Level = EventLevel.Warning,
534552
Keywords = Keywords.Rules,
535-
Opcode = EventOpcode.Info
553+
Opcode = EventOpcode.Info,
554+
Channel = EventChannel.Operational
536555
)]
537556
public void UnableToCastToRuleInputType(
538557
string itemType,

Sources/LambdaConverters.Wpf/LambdaConverters.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>LambdaConverters</RootNamespace>
1111
<AssemblyName>LambdaConverters.Wpf</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>

Sources/LambdaConverters.Wpf/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
[assembly: AssemblyDescription("")]
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("")]
11-
[assembly: AssemblyProduct("LambdaConvertersAndCo")]
12-
[assembly: AssemblyCopyright("© 2017 Michael Damatov, Yeah69.")]
11+
[assembly: AssemblyProduct("LambdaConverters")]
12+
[assembly: AssemblyCopyright("© 2017 Michael Damatov.")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("3.0.2.0")]
35-
[assembly: AssemblyFileVersion("3.0.2")]
34+
[assembly: AssemblyVersion("2.0.0.0")]
35+
[assembly: AssemblyFileVersion("2.0.0")]

Sources/LambdaConverters.Wpf/Validator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected override ValidationResult ValidateInternal(object item, CultureInfo cu
7575
/// Initializes a new instance of the <see cref="ValidationRule" /> class.
7676
/// </summary>
7777
/// <typeparam name="I">The value type.</typeparam>
78-
/// <param name="ruleFunction">The Validate method.</param>
78+
/// <param name="ruleFunction">The <see cref="ValidationRule.Validate" /> method.</param>
7979
/// <param name="errorStrategy">The error strategy.</param>
8080
/// <returns>An <see cref="ValidationRule" /> object.</returns>
8181
/// <exception cref="ArgumentOutOfRangeException">

Sources/Tests.LambdaConverters.Wpf/Tests.LambdaConverters.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>Tests.LambdaConverters.Wpf</RootNamespace>
1010
<AssemblyName>Tests.LambdaConverters.Wpf</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6</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>

0 commit comments

Comments
 (0)