Merge branch 'GitHub/lambda-converters/etw' into GitHub/lambda-converters/master

Author: michael-damatov

Sources/LambdaConverters.Deployment/LambdaConverters.Deployment.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LambdaConverters.Deployment</RootNamespace>
     <AssemblyName>LambdaConverters.Deployment</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -36,8 +36,8 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="JetBrains.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -64,7 +64,9 @@
     <None Include="LambdaConverters.nuspec">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Sources/LambdaConverters.Deployment/LambdaConverters.nuspec

@@ -6,11 +6,11 @@
         <title>Lambda Converters</title>
         <authors>Michael Damatov</authors>
         <summary>Strongly-typed lambda expressions as value converters</summary>
-        <description>The library allows to write IValueConverter and IMultiValueConverter objects with the most convenient syntax available, ideally, using the lambda expressions.</description>
+        <description>The library allows to create IValueConverter and IMultiValueConverter objects with the most convenient syntax available, ideally, using the lambda expressions.</description>
         <projectUrl>https://github.com/michael-damatov/lambda-converters</projectUrl>
         <iconUrl>https://raw.githubusercontent.com/michael-damatov/lambda-converters/master/Icon.png</iconUrl>
         <licenseUrl>https://github.com/michael-damatov/lambda-converters/blob/master/LICENSE</licenseUrl>
-        <tags>lambda expression converter strongly typed value multi</tags>
+        <tags>lambda expression converter wpf strongly typed value multi</tags>
     </metadata>
     <files />
 </package>

Sources/LambdaConverters.Deployment/Program.cs

@@ -73,7 +73,6 @@ static void GetPaths(
             isReleaseBuild = string.Equals(executionDirectory, "release", StringComparison.OrdinalIgnoreCase);
 
             var solutionDirectory = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(executionDirectoryPath)));
-            Debug.Assert(solutionDirectory != null);
 
             nugetPath = Path.Combine(solutionDirectory, "NuGet.exe");
 
@@ -109,13 +108,13 @@ static void UpdateNuspec([NotNull] string assemblyPath, [NotNull] string nuspecP
             Debug.Assert(metadataElement != null);
 
             var versionElement = metadataElement.Element("version");
-            var fileVersionAttributeData = assembly.GetCustomAttributesData()?.First(a => a?.AttributeType == typeof(AssemblyFileVersionAttribute));
+            var fileVersionAttributeData = assembly.GetCustomAttributesData()?.First(a => a.AttributeType == typeof(AssemblyFileVersionAttribute));
             Debug.Assert(versionElement != null);
             Debug.Assert(fileVersionAttributeData != null);
             Debug.Assert(fileVersionAttributeData.ConstructorArguments[0].Value is string);
             versionElement.Value = (string)fileVersionAttributeData.ConstructorArguments[0].Value;
 
-            const string target = @"lib\net45";
+            const string target = @"lib\net46";
             nuspec.Root.Element("files")?
                 .Add(
                     new XElement("file", new XAttribute("src", assemblyPath), new XAttribute("target", target)),
@@ -179,7 +178,6 @@ static void RunConsoleApplication([NotNull] string executablePath, [NotNull] str
         static void OpenInWindowsExplorer([NotNull] string nuspecPath, [NotNull] string packageFileName)
         {
             var nuspecDirectoryPath = Path.GetDirectoryName(nuspecPath);
-            Debug.Assert(nuspecDirectoryPath != null);
 
             using (Process.Start("explorer", "/select, \"" + Path.Combine(nuspecDirectoryPath, packageFileName) + "\"")) { }
         }

Sources/LambdaConverters.Deployment/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="JetBrains.Annotations" version="10.0.0" targetFramework="net45" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net46" />
 </packages>

Sources/LambdaConverters.Wpf/ConverterErrorStrategy.cs

@@ -13,13 +13,13 @@ public enum ConverterErrorStrategy
         ReturnDefaultValue,
 
         /// <summary>
-        /// No value is returned, but the binding is instructed use the <see cref="BindingBase.FallbackValue"/>, if available, or the default target 
+        /// No value is returned, but the binding is instructed use the <see cref="BindingBase.FallbackValue"/>, if available, or the default target
         /// property value.
         /// </summary>
         UseFallbackOrDefaultValue,
 
         /// <summary>
-        /// No value is returned and the binding is instructed not to use the <see cref="BindingBase.FallbackValue"/> or the default target property 
+        /// No value is returned and the binding is instructed not to use the <see cref="BindingBase.FallbackValue"/> or the default target property
         /// value.
         /// </summary>
         DoNothing,