Skip to content

Commit e7fac99

Browse files
bclothierbclothier
committed
Initial version using newest SDK supporting WinForms & WPF
1 parent 347c603 commit e7fac99

File tree

24 files changed

+39
-78
lines changed

24 files changed

+39
-78
lines changed

‎Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project>
33
<PropertyGroup>
44
<Product>Rubberduck.CodeAnalysis</Product>
55
<Description>Assembly Containing the Code Analysis features exposed by Rubberduck</Description>

‎Rubberduck.Core/Rubberduck.Core.csproj

+3-34
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<PropertyGroup>
44
<RootNamespace>Rubberduck</RootNamespace>
55
<AssemblyName>Rubberduck.Core</AssemblyName>
@@ -11,9 +11,8 @@
1111
<!-- Disable "Missing XML documentation" warning (CS1591) -->
1212
<DisabledWarnings>$(DisabledWarnings);1591</DisabledWarnings>
1313
<ApplicationIcon>Ducky.ico</ApplicationIcon>
14-
<!-- Give a fixed version to not blow XAML generated code to smithereens -->
15-
<!-- This also fixes "Input string was not in the correct format" error message when referring to the current assembly in an XAML-Namespace -->
16-
<AssemblyVersion>2.4.1</AssemblyVersion>
14+
<UseWpf>true</UseWpf>
15+
<UseWindowsForms>true</UseWindowsForms>
1716
</PropertyGroup>
1817
<Import Project="..\RubberduckBaseProject.csproj" />
1918
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAccess|AnyCPU'">
@@ -91,34 +90,4 @@
9190
<Version>2.0.20525</Version>
9291
</PackageReference>
9392
</ItemGroup>
94-
95-
<!-- BEGIN WINDOWS FORMS WORKAROUND SECTION -->
96-
<ItemGroup>
97-
<Compile Update="**\*Window.cs" SubType="Form" />
98-
<Compile Update="**\*Dialog.cs" SubType="Form" />
99-
<Compile Update="**\SettingsForm.cs" SubType="Form" />
100-
<Compile Update="**\SimpleListControl.cs" SubType="Form" />
101-
<Compile Update="**\Splash.cs" SubType="Form" />
102-
<Compile Update="**\*.Designer.cs">
103-
<DependentUpon>$([System.String]::Copy('%(Filename)').Replace('.Designer', '')).cs</DependentUpon>
104-
</Compile>
105-
<EmbeddedResource Update="UI\**\*.resx">
106-
<DependentUpon>%(Filename).cs</DependentUpon>
107-
</EmbeddedResource>
108-
</ItemGroup>
109-
<ItemGroup>
110-
<Compile Update="Properties\Settings.Designer.cs">
111-
<DependentUpon>Settings.settings</DependentUpon>
112-
<DesignTime>True</DesignTime>
113-
<AutoGen>True</AutoGen>
114-
</Compile>
115-
</ItemGroup>
116-
<ItemGroup>
117-
<None Update="Properties\Settings.settings">
118-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
119-
<Generator>SettingsSingleFileGenerator</Generator>
120-
</None>
121-
</ItemGroup>
122-
<!-- END WINDOWS FORMS WORKAROUND SECTION -->
123-
12493
</Project>

‎Rubberduck.Deployment.Build/Rubberduck.Deployment.Build.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project>
33
<PropertyGroup>
44
<Product>Rubberduck.Deployment.Build</Product>
55
<Copyright>Copyright © 2018</Copyright>

‎Rubberduck.Deployment/Rubberduck.Deployment.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project Sdk="MSBuild.Sdk.Extras">
33
<PropertyGroup>
44
<Product>Rubberduck.Deployment</Product>
55
<Copyright>Copyright © 2018-2019</Copyright>

‎Rubberduck.Interaction/Rubberduck.Interaction.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project>
33
<PropertyGroup>
44
<Copyright>Copyright © 2018-2019</Copyright>
55
<Product>Rubberduck.Interaction</Product>
@@ -24,8 +24,6 @@
2424
</PackageReference>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<Compile Update="Refactorings\IAssignedByValParameterQuickFixDialog.cs">
28-
<SubType>Form</SubType>
29-
</Compile>
27+
<Compile Update="Refactorings\IAssignedByValParameterQuickFixDialog.cs" />
3028
</ItemGroup>
3129
</Project>

‎Rubberduck.JunkDrawer/Rubberduck.JunkDrawer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.JunkDrawer</Title>
55
<Product>Rubberduck.JunkDrawer</Product>

‎Rubberduck.Main/Rubberduck.Main.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<PropertyGroup>
44
<RootNamespace>Rubberduck</RootNamespace>
55
<AssemblyName>Rubberduck</AssemblyName>
@@ -8,6 +8,8 @@
88
<ProjectGuid>{E8AB5D93-2D0F-423D-BC15-5EE118673E48}</ProjectGuid>
99
<!-- Disable "Missing XML documentation" warning (CS1591) -->
1010
<DisabledWarnings>$(DisabledWarnings);1591</DisabledWarnings>
11+
<UseWpf>true</UseWpf>
12+
<UseWindowsForms>true</UseWindowsForms>
1113
</PropertyGroup>
1214
<Import Project="..\RubberduckBaseProject.csproj" />
1315

‎Rubberduck.Parsing/Rubberduck.Parsing.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project>
33
<PropertyGroup>
44
<AssemblyName>Rubberduck.Parsing</AssemblyName>
55
<Title>Rubberduck.Parsing</Title>

‎Rubberduck.Refactorings/Rubberduck.Refactorings.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
2+
<Project>
33
<PropertyGroup>
44
<ProjectGuid>{D4B6A510-14E1-420A-A8D5-6A09890FD7D8}</ProjectGuid>
55
<RootNamespace>Rubberduck.Refactorings</RootNamespace>

‎Rubberduck.RegexAssistant/Rubberduck.RegexAssistant.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.RegexAssistant</Title>
55
<Product>Rubberduck.RegexAssistant</Product>

‎Rubberduck.Resources/Rubberduck.Resources.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.Resources</Title>
55
<Product>Rubberduck.Resources</Product>

‎Rubberduck.SettingsProvider/Rubberduck.SettingsProvider.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.SettingsProvider</Title>
55
<Product>Rubberduck.SettingsProvider</Product>

‎Rubberduck.SmartIndenter/Rubberduck.SmartIndenter.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.SmartIndenter</Title>
55
<Product>Rubberduck.SmartIndenter</Product>

‎Rubberduck.UnitTesting/Rubberduck.UnitTesting.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.UnitTesting</Title>
55
<Product>Rubberduck.UnitTesting</Product>

‎Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<RootNamespace>Rubberduck.VBEditor</RootNamespace>
55
<AssemblyName>Rubberduck.VBEditor</AssemblyName>

‎Rubberduck.VBEditor.VB6/Rubberduck.VBEditor.VB6.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.VBEditor.VB6</Title>
55
<Product>Rubberduck.VBEditor.VB6</Product>

‎Rubberduck.VBEditor.VBA/Rubberduck.VBEditor.VBA.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck.VBEditor.VBA</Title>
55
<Product>Rubberduck.VBEditor.VBA</Product>

‎Rubberduck.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2010
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29318.209
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rubberduck.Parsing", "Rubberduck.Parsing\Rubberduck.Parsing.csproj", "{A4A618E1-CBCA-435F-9C6C-5181E030ADFC}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2525
libs\Microsoft.Vbe.Interop.dll = libs\Microsoft.Vbe.Interop.dll
2626
libs\Office.dll = libs\Office.dll
2727
Performance6.psess = Performance6.psess
28+
RubberduckBaseProject.csproj = RubberduckBaseProject.csproj
2829
EndProjectSection
2930
EndProject
3031
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rubberduck.VBEditor", "Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj", "{8CE35EB3-8852-4BA1-84DD-DF3F5D2967B0}"

‎RubberduckBaseMetaProject.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<!-- We're specifying the Sdk here to make appveyor happy, but this generates warning MSB4011 -->
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -10,7 +10,6 @@
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1111
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1212
<OutputPath>bin\$(Configuration)\</OutputPath>
13-
<RunCodeAnalysis>true</RunCodeAnalysis>
1413
<RestorePackages>true</RestorePackages>
1514
<!-- meta projects should have its path unified for easier discovery by the core solution -->
1615
<UnifyOutputPath>true</UnifyOutputPath>

‎RubberduckBaseProject.csproj

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<!-- We're specifying the Sdk here to make appveyor happy, but this generates warning MSB4011 -->
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -10,7 +10,6 @@
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1111
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1212
<OutputPath>bin\$(Configuration)\</OutputPath>
13-
<RunCodeAnalysis>true</RunCodeAnalysis>
1413
<RestorePackages>true</RestorePackages>
1514
<!-- do not unify output paths by default -->
1615
<UnifyOutputPath Condition=" '$(UnifyOutputPath)' == ''">false</UnifyOutputPath>
@@ -20,19 +19,6 @@
2019
<Version Condition=" '$(Version)' == ''">2.4.1</Version>
2120
</PropertyGroup>
2221

23-
<PropertyGroup Condition=" '$(AssemblyVersion)' == '' ">
24-
<!--
25-
This assembly version specification is considered nonstandard.
26-
As such builds that do not override the assembly version generate a warning, which we ignore.
27-
-->
28-
<AssemblyVersion>2.4.1.*</AssemblyVersion>
29-
<!-- Ignore CSharp compiler warning for nonstandard assembly version (CS7035) -->
30-
<!-- Ignore Linker warning for nonstandard assembly version (AL1053) -->
31-
<DisabledWarnings>$(DisabledWarnings);7035;1053</DisabledWarnings>
32-
<!-- Wildcards are not deterministic, ensure build passes when setting wildcard versions -->
33-
<Deterministic>False</Deterministic>
34-
</PropertyGroup>
35-
3622
<PropertyGroup Condition=" $(UnifyOutputPath) ">
3723
<OutputPath>bin\</OutputPath>
3824
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

‎RubberduckCodeAnalysis/RubberduckCodeAnalysis.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<Title>Rubberduck Code Analysis</Title>
55
<Description>Internal Analyzer to enforce standards for Rubberduck solution's codebase</Description>

‎RubberduckMeta.sln

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27130.2010
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29318.209
45
MinimumVisualStudioVersion = 10.0.40219.1
56
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RubberduckCodeAnalysis", "RubberduckCodeAnalysis\RubberduckCodeAnalysis.csproj", "{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}"
67
EndProject
@@ -11,6 +12,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rubberduck.Deployment.Build
1112
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323} = {F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}
1213
EndProjectSection
1314
EndProject
15+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CEF00AF5-AA3B-4D92-84CB-0B7935744CD9}"
16+
ProjectSection(SolutionItems) = preProject
17+
RubberduckBaseMetaProject.csproj = RubberduckBaseMetaProject.csproj
18+
EndProjectSection
19+
EndProject
1420
Global
1521
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1622
Debug|Any CPU = Debug|Any CPU

‎RubberduckTests/RubberduckTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<RootNamespace>RubberduckTests</RootNamespace>
55
<AssemblyName>RubberduckTests</AssemblyName>

‎RubberduckTestsCodeAnalysis/RubberduckTestsCodeAnalysis.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47" ToolsVersion="15.0">
2+
<Project>
33
<PropertyGroup>
44
<RootNamespace>RubberduckTestsCodeAnalysis</RootNamespace>
55
<AssemblyName>RubberduckTestsCodeAnalysis</AssemblyName>

0 commit comments

Comments
 (0)