Skip to content

Commit f5547f0

Browse files
codeofduskcodeofdusk
authored
Apply whitespace changes to csproj files, fix nuspec, and revert some dependency updates (#1052)
Git is stuck with more whitespace changes, see #1044. In #1041, Dependabot failed to update the nuspec file. Update accordingly. Revert #1051 for now to unblock the release.
1 parent 90b7906 commit f5547f0

File tree

19 files changed

+192
-195
lines changed

19 files changed

+192
-195
lines changed

‎src/Actions/Actions.csproj‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<AssemblyName>Axe.Windows.Actions</AssemblyName>
6-
<RootNamespace>Axe.Windows.Actions</RootNamespace>
7-
</PropertyGroup>
8-
9-
<Import Project="..\..\build\NetStandardRelease.targets" />
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="3.3.4">
21-
<PrivateAssets>all</PrivateAssets>
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
</PackageReference>
24-
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
25-
<PackageReference Include="System.IO.Packaging" Version="8.0.0" />
26-
<PackageReference Include="Text.Analyzers" Version="3.3.4">
27-
<PrivateAssets>all</PrivateAssets>
28-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29-
</PackageReference>
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<ProjectReference Include="..\Core\Core.csproj" />
34-
<ProjectReference Include="..\Desktop\Desktop.csproj" />
35-
<ProjectReference Include="..\Rules\Rules.csproj" />
36-
<ProjectReference Include="..\Win32\Win32.csproj" />
37-
</ItemGroup>
38-
39-
<ItemGroup>
40-
<Reference Include="Interop.UIAutomationClient">
41-
<HintPath>..\UIAAssemblies\Win10.17713\Interop.UIAutomationClient.dll</HintPath>
42-
<EmbedInteropTypes>true</EmbedInteropTypes>
43-
</Reference>
44-
</ItemGroup>
45-
46-
<ItemGroup>
47-
<Compile Update="Resources\ErrorMessages.Designer.cs">
48-
<DesignTime>True</DesignTime>
49-
<AutoGen>True</AutoGen>
50-
<DependentUpon>ErrorMessages.resx</DependentUpon>
51-
</Compile>
52-
</ItemGroup>
53-
54-
<ItemGroup>
55-
<EmbeddedResource Update="Resources\ErrorMessages.resx">
56-
<Generator>ResXFileCodeGenerator</Generator>
57-
<LastGenOutput>ErrorMessages.Designer.cs</LastGenOutput>
58-
</EmbeddedResource>
59-
</ItemGroup>
60-
61-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyName>Axe.Windows.Actions</AssemblyName>
6+
<RootNamespace>Axe.Windows.Actions</RootNamespace>
7+
</PropertyGroup>
8+
9+
<Import Project="..\..\build\NetStandardRelease.targets" />
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="3.3.4">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
25+
<PackageReference Include="System.IO.Packaging" Version="8.0.0" />
26+
<PackageReference Include="Text.Analyzers" Version="3.3.4">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<ProjectReference Include="..\Core\Core.csproj" />
34+
<ProjectReference Include="..\Desktop\Desktop.csproj" />
35+
<ProjectReference Include="..\Rules\Rules.csproj" />
36+
<ProjectReference Include="..\Win32\Win32.csproj" />
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<Reference Include="Interop.UIAutomationClient">
41+
<HintPath>..\UIAAssemblies\Win10.17713\Interop.UIAutomationClient.dll</HintPath>
42+
<EmbedInteropTypes>true</EmbedInteropTypes>
43+
</Reference>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<Compile Update="Resources\ErrorMessages.Designer.cs">
48+
<DesignTime>True</DesignTime>
49+
<AutoGen>True</AutoGen>
50+
<DependentUpon>ErrorMessages.resx</DependentUpon>
51+
</Compile>
52+
</ItemGroup>
53+
54+
<ItemGroup>
55+
<EmbeddedResource Update="Resources\ErrorMessages.resx">
56+
<Generator>ResXFileCodeGenerator</Generator>
57+
<LastGenOutput>ErrorMessages.Designer.cs</LastGenOutput>
58+
</EmbeddedResource>
59+
</ItemGroup>
60+
61+
</Project>

‎src/ActionsTests/ActionsTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1515
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
1717
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
1818
<PackageReference Include="coverlet.collector" Version="6.0.2">
1919
<PrivateAssets>all</PrivateAssets>

‎src/AutomationTests/AutomationTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1515
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
1717
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
1818
<PackageReference Include="coverlet.collector" Version="6.0.2">
1919
<PrivateAssets>all</PrivateAssets>

‎src/CI/Axe.Windows.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<group targetFramework="netstandard2.0">
1919
<dependency id="Newtonsoft.Json" version="13.0.3" />
2020
<dependency id="Microsoft.Win32.Registry" version="5.0.0" />
21-
<dependency id="System.Drawing.Common" version="8.0.7" />
21+
<dependency id="System.Drawing.Common" version="8.0.8" />
2222
<dependency id="System.IO.Packaging" version="8.0.0" />
2323
</group>
2424
</dependencies>

‎src/CLITests/CLITests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1919
<PackageReference Include="Moq" Version="4.18.4" />
20-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
20+
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
2121
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
2222
</ItemGroup>
2323

‎src/CoreTests/CoreTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1515
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
1717
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
1818
<PackageReference Include="coverlet.collector" Version="6.0.2">
1919
<PrivateAssets>all</PrivateAssets>

‎src/CurrentFileVersionCompatibilityTests/App.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
</startup>
66
<runtime>
77
<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-13.0.0.0" newVersion="13.0.0.0" />
11-
</dependentAssembly>
128
</assemblyBinding>
139
</runtime>
1410
</configuration>

‎src/CurrentFileVersionCompatibilityTests/CurrentFileVersionCompatibilityTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<Reference Include="Axe.Windows.Win32, Version=0.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Axe.Windows.0.3.1-prerelease\lib\net471\Axe.Windows.Win32.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
63+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6565
</Reference>
6666
<Reference Include="System" />
6767
<Reference Include="System.Drawing" />

‎src/CurrentFileVersionCompatibilityTests/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<!-- Reminder: Axe.Windows and Newtonsoft are INTENTIONALLY PINNED on old versions in this project! -->
34
<package id="Axe.Windows" version="0.3.1-prerelease" targetFramework="net472" />
4-
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
5+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net472" />
56
</packages>

‎src/Desktop/Desktop.csproj‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<AssemblyName>Axe.Windows.Desktop</AssemblyName>
6-
<RootNamespace>Axe.Windows.Desktop</RootNamespace>
7-
</PropertyGroup>
8-
9-
<Import Project="..\..\build\NetStandardRelease.targets" />
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21-
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="3.3.4">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
</PackageReference>
25-
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
26-
<PackageReference Include="Text.Analyzers" Version="3.3.4">
27-
<PrivateAssets>all</PrivateAssets>
28-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29-
</PackageReference>
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<ProjectReference Include="..\Core\Core.csproj" />
34-
<ProjectReference Include="..\RuleSelection\RuleSelection.csproj" />
35-
</ItemGroup>
36-
37-
<ItemGroup>
38-
<Reference Include="Interop.UIAutomationClient">
39-
<HintPath>..\UIAAssemblies\Win10.17713\Interop.UIAutomationClient.dll</HintPath>
40-
<EmbedInteropTypes>true</EmbedInteropTypes>
41-
</Reference>
42-
</ItemGroup>
43-
44-
<ItemGroup>
45-
<Reference Include="Interop.UIAutomationCore">
46-
<HintPath>..\InteropDummy\bin\$(Configuration)\net6.0\Interop.UIAutomationCore.dll</HintPath>
47-
<EmbedInteropTypes>true</EmbedInteropTypes>
48-
</Reference>
49-
</ItemGroup>
50-
51-
<ItemGroup>
52-
<Compile Update="Resources\ErrorMessages.Designer.cs">
53-
<DesignTime>True</DesignTime>
54-
<AutoGen>True</AutoGen>
55-
<DependentUpon>ErrorMessages.resx</DependentUpon>
56-
</Compile>
57-
</ItemGroup>
58-
59-
<ItemGroup>
60-
<EmbeddedResource Update="Resources\ErrorMessages.resx">
61-
<Generator>ResXFileCodeGenerator</Generator>
62-
<LastGenOutput>ErrorMessages.Designer.cs</LastGenOutput>
63-
</EmbeddedResource>
64-
</ItemGroup>
65-
66-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyName>Axe.Windows.Desktop</AssemblyName>
6+
<RootNamespace>Axe.Windows.Desktop</RootNamespace>
7+
</PropertyGroup>
8+
9+
<Import Project="..\..\build\NetStandardRelease.targets" />
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21+
<PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="3.3.4">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
25+
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
26+
<PackageReference Include="Text.Analyzers" Version="3.3.4">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<ProjectReference Include="..\Core\Core.csproj" />
34+
<ProjectReference Include="..\RuleSelection\RuleSelection.csproj" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<Reference Include="Interop.UIAutomationClient">
39+
<HintPath>..\UIAAssemblies\Win10.17713\Interop.UIAutomationClient.dll</HintPath>
40+
<EmbedInteropTypes>true</EmbedInteropTypes>
41+
</Reference>
42+
</ItemGroup>
43+
44+
<ItemGroup>
45+
<Reference Include="Interop.UIAutomationCore">
46+
<HintPath>..\InteropDummy\bin\$(Configuration)\net6.0\Interop.UIAutomationCore.dll</HintPath>
47+
<EmbedInteropTypes>true</EmbedInteropTypes>
48+
</Reference>
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<Compile Update="Resources\ErrorMessages.Designer.cs">
53+
<DesignTime>True</DesignTime>
54+
<AutoGen>True</AutoGen>
55+
<DependentUpon>ErrorMessages.resx</DependentUpon>
56+
</Compile>
57+
</ItemGroup>
58+
59+
<ItemGroup>
60+
<EmbeddedResource Update="Resources\ErrorMessages.resx">
61+
<Generator>ResXFileCodeGenerator</Generator>
62+
<LastGenOutput>ErrorMessages.Designer.cs</LastGenOutput>
63+
</EmbeddedResource>
64+
</ItemGroup>
65+
66+
</Project>

0 commit comments

Comments
 (0)