Skip to content

Commit c5525ca

Browse files
- use ETW instead of TraceSource
- require .NET 4.6 - remove redundant assertions - update used annotation package
1 parent 73a49ea commit c5525ca

21 files changed

+697
-374
lines changed

Sources/LambdaConverters.Deployment/LambdaConverters.Deployment.csproj

Lines changed: 6 additions & 4 deletions
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>
@@ -36,8 +36,8 @@
3636
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="JetBrains.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
40-
<HintPath>..\packages\JetBrains.Annotations.10.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
39+
<Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
40+
<HintPath>..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="System" />
@@ -64,7 +64,9 @@
6464
<None Include="LambdaConverters.nuspec">
6565
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6666
</None>
67-
<None Include="packages.config" />
67+
<None Include="packages.config">
68+
<SubType>Designer</SubType>
69+
</None>
6870
<None Include="Properties\Settings.settings">
6971
<Generator>SettingsSingleFileGenerator</Generator>
7072
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

Sources/LambdaConverters.Deployment/Program.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ static void GetPaths(
7373
isReleaseBuild = string.Equals(executionDirectory, "release", StringComparison.OrdinalIgnoreCase);
7474

7575
var solutionDirectory = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(executionDirectoryPath)));
76-
Debug.Assert(solutionDirectory != null);
7776

7877
nugetPath = Path.Combine(solutionDirectory, "NuGet.exe");
7978

@@ -109,13 +108,13 @@ static void UpdateNuspec([NotNull] string assemblyPath, [NotNull] string nuspecP
109108
Debug.Assert(metadataElement != null);
110109

111110
var versionElement = metadataElement.Element("version");
112-
var fileVersionAttributeData = assembly.GetCustomAttributesData()?.First(a => a?.AttributeType == typeof(AssemblyFileVersionAttribute));
111+
var fileVersionAttributeData = assembly.GetCustomAttributesData()?.First(a => a.AttributeType == typeof(AssemblyFileVersionAttribute));
113112
Debug.Assert(versionElement != null);
114113
Debug.Assert(fileVersionAttributeData != null);
115114
Debug.Assert(fileVersionAttributeData.ConstructorArguments[0].Value is string);
116115
versionElement.Value = (string)fileVersionAttributeData.ConstructorArguments[0].Value;
117116

118-
const string target = @"lib\net45";
117+
const string target = @"lib\net46";
119118
nuspec.Root.Element("files")?
120119
.Add(
121120
new XElement("file", new XAttribute("src", assemblyPath), new XAttribute("target", target)),
@@ -179,7 +178,6 @@ static void RunConsoleApplication([NotNull] string executablePath, [NotNull] str
179178
static void OpenInWindowsExplorer([NotNull] string nuspecPath, [NotNull] string packageFileName)
180179
{
181180
var nuspecDirectoryPath = Path.GetDirectoryName(nuspecPath);
182-
Debug.Assert(nuspecDirectoryPath != null);
183181

184182
using (Process.Start("explorer", "/select, \"" + Path.Combine(nuspecDirectoryPath, packageFileName) + "\"")) { }
185183
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="JetBrains.Annotations" version="10.0.0" targetFramework="net45" />
3+
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net46" />
44
</packages>

Sources/LambdaConverters.Wpf/ConverterErrorStrategy.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public enum ConverterErrorStrategy
1313
ReturnDefaultValue,
1414

1515
/// <summary>
16-
/// No value is returned, but the binding is instructed use the <see cref="BindingBase.FallbackValue"/>, if available, or the default target
16+
/// No value is returned, but the binding is instructed use the <see cref="BindingBase.FallbackValue"/>, if available, or the default target
1717
/// property value.
1818
/// </summary>
1919
UseFallbackOrDefaultValue,
2020

2121
/// <summary>
22-
/// No value is returned and the binding is instructed not to use the <see cref="BindingBase.FallbackValue"/> or the default target property
22+
/// No value is returned and the binding is instructed not to use the <see cref="BindingBase.FallbackValue"/> or the default target property
2323
/// value.
2424
/// </summary>
2525
DoNothing,

Sources/LambdaConverters.Wpf/Diagnostics.cs

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

0 commit comments

Comments
 (0)