Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Csproj format update, fixes #3944 #4383

Merged
merged 52 commits into from Oct 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
1dbbc9f
Update Rubberduck.API.csproj to 2017 format
Vogel612 Sep 16, 2018
c1032b3
Migrate All NuGet References
Vogel612 Sep 18, 2018
5e0705a
Move Rubberduck.CodeAnalysis to new csproj format
Vogel612 Sep 18, 2018
ae9d069
Unify dependency versions, Update NLog, System.ValueTuple
Vogel612 Sep 18, 2018
b74c836
remove unused NuGet packages from Rubberduck.Api
Vogel612 Sep 20, 2018
313ed6a
Move Rubberduck.Deployment to new csproj
Vogel612 Sep 20, 2018
382963c
Tweak System.Composition version and ValueTuple bindingRedirect
Vogel612 Sep 21, 2018
a4da145
Move Rubberduck.Interaction to new csproj format
Vogel612 Sep 21, 2018
d95bfd9
Move Rubberduck.Main to new csproj format
Vogel612 Sep 23, 2018
f74b31b
Move Rubberduck.Parsing to new csproj
Vogel612 Sep 24, 2018
c7352c6
Move Rubberduck.Refactorings to new csproj
Vogel612 Sep 24, 2018
cb4015c
Move Rubberduck.RegexAssistant to new csproj
Vogel612 Sep 24, 2018
a8f84b1
Move Rubberduck.Resources to new csproj
Vogel612 Sep 24, 2018
6ae2af8
Move Rubberduck.SettingsProvider to new csproj
Vogel612 Sep 24, 2018
16aa2a5
Move Rubberduck.SmartIndenter to new csproj
Vogel612 Sep 24, 2018
f7bf4c1
Move Rubberduck.UnitTesting to new csproj
Vogel612 Sep 24, 2018
d82b6c7
Move Rubberduck.VBEditor.VB6 to new csproj
Vogel612 Sep 24, 2018
6166032
Move Rubberduck.VBEditor.VBA to new csproj
Vogel612 Sep 24, 2018
4db37b5
Move Rubberduck.VBEEditor to new csproj
Vogel612 Sep 24, 2018
d1c5b4e
Move RubberduckTests to new csproj format
Vogel612 Sep 26, 2018
4064a05
Move RubberduckCodeAnalysis to new csproj
Vogel612 Sep 26, 2018
560bc68
Move RubberduckTestsCodeAnalysis to new csproj
Vogel612 Sep 26, 2018
d4c1f4f
Push around stuff in CodeAnalysis trying to fix AppVeyor
Vogel612 Sep 26, 2018
94f4bf7
Remove incorrect Version specifier from new csproj files
Vogel612 Sep 26, 2018
2018992
Fix Microsoft.Composition version mismatch
Vogel612 Sep 26, 2018
1b74bd5
Move Rubberduck.Core to new csproj, but ignore breakage for now
Vogel612 Sep 29, 2018
bfc36f8
Fix self-referencing analyzer blowing itself to pieces
Vogel612 Sep 29, 2018
b1b3156
Remove unused Zombie Files still under versioning
Vogel612 Sep 24, 2018
9198d31
Fix build issues in Rubberduck.Core
Vogel612 Sep 29, 2018
4ac3420
Fix nesting and project interdependencies
Vogel612 Oct 2, 2018
00bb350
Add BaseProject to unify common properties and requirements
Vogel612 Oct 2, 2018
8b5c6e0
Exploit and Extend RubberduckBaseProject
Vogel612 Oct 2, 2018
3ae8beb
Hide all assemblies from COM, fix Core/obj folder
Vogel612 Oct 2, 2018
90a36d7
Include TestsCodeAnalysis, fix Analyzer on Tests
Vogel612 Oct 5, 2018
4a9471a
Add RubberduckTestsCodeAnalysis to Solution
Vogel612 Oct 5, 2018
7be2071
Tests now do not force Debug, but default to it
Vogel612 Oct 5, 2018
bc60cc9
Fix CopyPaste error in Analyzer exclusion condition
Vogel612 Oct 5, 2018
c2af509
Simplify Output Paths for Analyzers and Test assembly
Vogel612 Oct 5, 2018
deffb42
Drop overconfiguration from CodeAnalysis
Vogel612 Oct 7, 2018
511b2fa
Ignore test failing due to incorrect code-gen
Vogel612 Oct 7, 2018
ee0cb3b
Unify Output Paths on Deployment and fix InnoSetup search path
Vogel612 Oct 7, 2018
9cd71ae
Make AppVeyor patch csproj instead of AssemblyInfo
Vogel612 Oct 7, 2018
55a3dc2
Affix version for Rubberduck.Core to sidestep XAML codegen issues
Vogel612 Oct 7, 2018
1ed02d1
Drop misuse of RubberduckTestsCodeAnalysis as Analyzer
Vogel612 Oct 7, 2018
b6259f1
Avoid marking Property Resources as dependent on code
Vogel612 Oct 14, 2018
d63a5ef
Patch csproj versions through appveyor
Vogel612 Oct 7, 2018
8c30cc5
Drop no longer needed explicit System.* References
Vogel612 Oct 14, 2018
7ace924
Remove artifact comments
Vogel612 Oct 14, 2018
fe3fc7c
Disable a handful of noisy and expected warnings
Vogel612 Oct 14, 2018
0986130
Update NoWarn to include DisabledWarnings
Vogel612 Oct 14, 2018
1715c4b
Remove effectless nesting attempts in Resources
Vogel612 Oct 14, 2018
dc7b5eb
Merge remote-tracking branch 'blessed/next' into csproj-format-update
Vogel612 Oct 17, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 1 addition & 25 deletions Rubberduck.API/Properties/AssemblyInfo.cs
@@ -1,19 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Rubberduck.Resources.Registration;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Rubberduck.API")]
[assembly: AssemblyDescription("Rubberduck Reflection API")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Rubberduck-VBA")]
[assembly: AssemblyProduct("Rubberduck.API")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCulture("en")]
[assembly: AssemblyTrademark("")]
[assembly: InternalsVisibleTo("RubberduckTests")]

// Setting ComVisible to false makes the types in this assembly not visible
Expand All @@ -23,15 +11,3 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid(RubberduckGuid.RubberduckApiTypeLibGuid)]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.*")]
86 changes: 14 additions & 72 deletions Rubberduck.API/Rubberduck.API.csproj
@@ -1,82 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Product>Rubberduck.API</Product>
<Description>Rubberduck Reflection API</Description>
<Copyright>Copyright © 2018</Copyright>
<ProjectGuid>{AC1B4A57-364A-4F90-A0CD-6EE818349CE5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rubberduck.API</RootNamespace>
<AssemblyName>Rubberduck.API</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<!--
TODO: affix AssemblyVersion and/or FileVersion for COM-Registration?!
-->
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="VBA\ApiProvider.cs" />
<Compile Include="VBA\Accessibility.cs" />
<Compile Include="VBA\Declaration.cs" />
<Compile Include="VBA\Declarations.cs" />
<Compile Include="VBA\DeclarationType.cs" />
<Compile Include="VBA\IdentifierReference.cs" />
<Compile Include="VBA\IdentifierReferences.cs" />
<Compile Include="VBA\Parser.cs" />
<Compile Include="VBA\ParserState.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
<Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
<Name>Rubberduck.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.Main\Rubberduck.Main.csproj">
<Project>{E8AB5D93-2D0F-423D-BC15-5EE118673E48}</Project>
<Name>Rubberduck.Main</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
<Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
<Name>Rubberduck.Parsing</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
<Project>{1b84b387-f7c4-4876-9bdf-c644c365359a}</Project>
<Name>Rubberduck.Resources</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
<Project>{8ce35eb3-8852-4ba1-84dd-df3f5d2967b0}</Project>
<Name>Rubberduck.VBEditor</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\RubberduckBaseProject.csproj" />

<ItemGroup>
<Folder Include="Plugin\" />
<ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj" />
<ProjectReference Include="..\Rubberduck.Main\Rubberduck.Main.csproj" />
<ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj" />
<ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj" />
<ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\RubberduckCodeAnalysis\bin\Release\RubberduckCodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

This file was deleted.