Skip to content

Commit d589b2f

Browse files
qdotqdot
committed
build: Update NLog to 4.5.0-rc3
Supports .Net Standard 2, easier to build (?) than 5.0-beta, which is now also an abandonded branch. Fixes #326
1 parent 81cba0e commit d589b2f

35 files changed

Lines changed: 523 additions & 409 deletions

File tree

‎Buttplug.Apps.DeviceSimulatorGUI/Buttplug.Apps.DeviceSimulatorGUI.csproj‎

Lines changed: 141 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,142 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{EBF5270A-54CB-4328-8E54-37972920EF1D}</ProjectGuid>
8-
<OutputType>WinExe</OutputType>
9-
<RootNamespace>Buttplug.Apps.DeviceSimulatorGUI</RootNamespace>
10-
<AssemblyName>DeviceSimulatorGUI</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<CodeAnalysisRuleSet>..\Buttplug.ProjectFiles\ButtplugCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
40-
</Reference>
41-
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
42-
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
46-
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
47-
</Reference>
48-
<Reference Include="PresentationCore" />
49-
<Reference Include="PresentationFramework" />
50-
<Reference Include="System" />
51-
<Reference Include="System.Drawing" />
52-
<Reference Include="System.Core" />
53-
<Reference Include="System.Windows.Forms" />
54-
<Reference Include="System.Xaml">
55-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
56-
</Reference>
57-
<Reference Include="TAlex.WPF.Controls, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
58-
<HintPath>..\packages\TAlex.WPF.Controls.2.0.1.0\lib\net40\TAlex.WPF.Controls.dll</HintPath>
59-
</Reference>
60-
<Reference Include="WindowsBase" />
61-
</ItemGroup>
62-
<ItemGroup>
63-
<ApplicationDefinition Include="App.xaml">
64-
<Generator>MSBuild:Compile</Generator>
65-
<SubType>Designer</SubType>
66-
</ApplicationDefinition>
67-
<Page Include="DeviceSimulator.xaml">
68-
<SubType>Designer</SubType>
69-
<Generator>MSBuild:Compile</Generator>
70-
</Page>
71-
<Page Include="MainWindow.xaml">
72-
<Generator>MSBuild:Compile</Generator>
73-
<SubType>Designer</SubType>
74-
</Page>
75-
<Compile Include="..\Buttplug.Server\Util\FleshlightHelper.cs">
76-
<Link>FleshlightHelper.cs</Link>
77-
</Compile>
78-
<Compile Include="App.xaml.cs">
79-
<DependentUpon>App.xaml</DependentUpon>
80-
<SubType>Code</SubType>
81-
</Compile>
82-
<Compile Include="DeviceSimulator.xaml.cs">
83-
<DependentUpon>DeviceSimulator.xaml</DependentUpon>
84-
</Compile>
85-
<Compile Include="MainWindow.xaml.cs">
86-
<DependentUpon>MainWindow.xaml</DependentUpon>
87-
<SubType>Code</SubType>
88-
</Compile>
89-
</ItemGroup>
90-
<ItemGroup>
91-
<Compile Include="PipeMessages.cs" />
92-
<Compile Include="Properties\AssemblyInfo.cs">
93-
<SubType>Code</SubType>
94-
</Compile>
95-
<Compile Include="Properties\Resources.Designer.cs">
96-
<AutoGen>True</AutoGen>
97-
<DesignTime>True</DesignTime>
98-
<DependentUpon>Resources.resx</DependentUpon>
99-
</Compile>
100-
<Compile Include="Properties\Settings.Designer.cs">
101-
<AutoGen>True</AutoGen>
102-
<DependentUpon>Settings.settings</DependentUpon>
103-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
104-
</Compile>
105-
<EmbeddedResource Include="Properties\Resources.resx">
106-
<Generator>PublicResXFileCodeGenerator</Generator>
107-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
108-
<SubType>Designer</SubType>
109-
</EmbeddedResource>
110-
<None Include="packages.config" />
111-
<None Include="Properties\Settings.settings">
112-
<Generator>SettingsSingleFileGenerator</Generator>
113-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
114-
</None>
115-
</ItemGroup>
116-
<ItemGroup>
117-
<None Include="App.config">
118-
<SubType>Designer</SubType>
119-
</None>
120-
</ItemGroup>
121-
<ItemGroup>
122-
<ProjectReference Include="..\Buttplug.Core\Buttplug.Core.csproj">
123-
<Project>{fc4af8fe-8c21-4e07-8d24-7fb7791149d0}</Project>
124-
<Name>Buttplug.Core</Name>
125-
</ProjectReference>
126-
</ItemGroup>
127-
<ItemGroup>
128-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta004\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
129-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta004\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
130-
</ItemGroup>
131-
<ItemGroup>
132-
<AdditionalFiles Include="..\Buttplug.ProjectFiles\stylecop.json" />
133-
</ItemGroup>
134-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{EBF5270A-54CB-4328-8E54-37972920EF1D}</ProjectGuid>
8+
<OutputType>WinExe</OutputType>
9+
<RootNamespace>Buttplug.Apps.DeviceSimulatorGUI</RootNamespace>
10+
<AssemblyName>DeviceSimulatorGUI</AssemblyName>
11+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<FileAlignment>512</FileAlignment>
13+
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14+
<WarningLevel>4</WarningLevel>
15+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<PlatformTarget>AnyCPU</PlatformTarget>
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>bin\Debug\</OutputPath>
23+
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
<CodeAnalysisRuleSet>..\Buttplug.ProjectFiles\ButtplugCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<PlatformTarget>AnyCPU</PlatformTarget>
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>bin\Release\</OutputPath>
33+
<DefineConstants>TRACE</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
</PropertyGroup>
37+
<ItemGroup>
38+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
40+
</Reference>
41+
<Reference Include="JetBrains.Annotations, Version=11.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
42+
<HintPath>..\packages\JetBrains.Annotations.11.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
43+
</Reference>
44+
<Reference Include="Microsoft.CSharp" />
45+
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
46+
<HintPath>..\packages\NLog.4.5.0-rc03\lib\net45\NLog.dll</HintPath>
47+
</Reference>
48+
<Reference Include="PresentationCore" />
49+
<Reference Include="PresentationFramework" />
50+
<Reference Include="System" />
51+
<Reference Include="System.Configuration" />
52+
<Reference Include="System.Data" />
53+
<Reference Include="System.Drawing" />
54+
<Reference Include="System.Core" />
55+
<Reference Include="System.IO.Compression" />
56+
<Reference Include="System.Runtime.Serialization" />
57+
<Reference Include="System.ServiceModel" />
58+
<Reference Include="System.Transactions" />
59+
<Reference Include="System.Windows.Forms" />
60+
<Reference Include="System.Xaml">
61+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
62+
</Reference>
63+
<Reference Include="System.Xml" />
64+
<Reference Include="TAlex.WPF.Controls, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\TAlex.WPF.Controls.2.0.1.0\lib\net40\TAlex.WPF.Controls.dll</HintPath>
66+
</Reference>
67+
<Reference Include="WindowsBase" />
68+
</ItemGroup>
69+
<ItemGroup>
70+
<ApplicationDefinition Include="App.xaml">
71+
<Generator>MSBuild:Compile</Generator>
72+
<SubType>Designer</SubType>
73+
</ApplicationDefinition>
74+
<Page Include="DeviceSimulator.xaml">
75+
<SubType>Designer</SubType>
76+
<Generator>MSBuild:Compile</Generator>
77+
</Page>
78+
<Page Include="MainWindow.xaml">
79+
<Generator>MSBuild:Compile</Generator>
80+
<SubType>Designer</SubType>
81+
</Page>
82+
<Compile Include="..\Buttplug.Server\Util\FleshlightHelper.cs">
83+
<Link>FleshlightHelper.cs</Link>
84+
</Compile>
85+
<Compile Include="App.xaml.cs">
86+
<DependentUpon>App.xaml</DependentUpon>
87+
<SubType>Code</SubType>
88+
</Compile>
89+
<Compile Include="DeviceSimulator.xaml.cs">
90+
<DependentUpon>DeviceSimulator.xaml</DependentUpon>
91+
</Compile>
92+
<Compile Include="MainWindow.xaml.cs">
93+
<DependentUpon>MainWindow.xaml</DependentUpon>
94+
<SubType>Code</SubType>
95+
</Compile>
96+
</ItemGroup>
97+
<ItemGroup>
98+
<Compile Include="PipeMessages.cs" />
99+
<Compile Include="Properties\AssemblyInfo.cs">
100+
<SubType>Code</SubType>
101+
</Compile>
102+
<Compile Include="Properties\Resources.Designer.cs">
103+
<AutoGen>True</AutoGen>
104+
<DesignTime>True</DesignTime>
105+
<DependentUpon>Resources.resx</DependentUpon>
106+
</Compile>
107+
<Compile Include="Properties\Settings.Designer.cs">
108+
<AutoGen>True</AutoGen>
109+
<DependentUpon>Settings.settings</DependentUpon>
110+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
111+
</Compile>
112+
<EmbeddedResource Include="Properties\Resources.resx">
113+
<Generator>PublicResXFileCodeGenerator</Generator>
114+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
115+
<SubType>Designer</SubType>
116+
</EmbeddedResource>
117+
<None Include="packages.config" />
118+
<None Include="Properties\Settings.settings">
119+
<Generator>SettingsSingleFileGenerator</Generator>
120+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
121+
</None>
122+
</ItemGroup>
123+
<ItemGroup>
124+
<None Include="App.config">
125+
<SubType>Designer</SubType>
126+
</None>
127+
</ItemGroup>
128+
<ItemGroup>
129+
<ProjectReference Include="..\Buttplug.Core\Buttplug.Core.csproj">
130+
<Project>{fc4af8fe-8c21-4e07-8d24-7fb7791149d0}</Project>
131+
<Name>Buttplug.Core</Name>
132+
</ProjectReference>
133+
</ItemGroup>
134+
<ItemGroup>
135+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta004\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
136+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta004\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
137+
</ItemGroup>
138+
<ItemGroup>
139+
<AdditionalFiles Include="..\Buttplug.ProjectFiles\stylecop.json" />
140+
</ItemGroup>
141+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
135142
</Project>

‎Buttplug.Apps.DeviceSimulatorGUI/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net452" />
4-
<package id="Microsoft.CSharp" version="4.4.0" targetFramework="net452" />
5-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
6-
<package id="NLog" version="4.4.12" targetFramework="net452" />
7-
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net452" developmentDependency="true" />
8-
<package id="TAlex.WPF.Controls" version="2.0.1.0" targetFramework="net452" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net452" />
4+
<package id="Microsoft.CSharp" version="4.4.0" targetFramework="net452" />
5+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
6+
<package id="NLog" version="4.5.0-rc03" targetFramework="net452" />
7+
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net452" developmentDependency="true" />
8+
<package id="TAlex.WPF.Controls" version="2.0.1.0" targetFramework="net452" />
99
</packages>

‎Buttplug.Apps.ExampleClientGUI/App.config‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
5-
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11-
</dependentAssembly>
12-
</assemblyBinding>
13-
</runtime>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
5+
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
1414
</configuration>

0 commit comments

Comments
 (0)