From dcc956b1507efd40aaa078910f7c7d433c562523 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 2 Nov 2010 20:50:25 -0400 Subject: Update project files with git location for cecil. Fix wix project wrt FX3.5 --- gendarme/AssemblyStaticInfo.cs | 2 +- gendarme/console/gendarme.csproj | 2 +- gendarme/framework/Gendarme.Framework.csproj | 308 ++++++++++----------- gendarme/framework/Test/Tests.Framework.csproj | 2 +- gendarme/gendarme-win.sln | 5 +- .../Gendarme.Rules.BadPractice.csproj | 2 +- .../Test/Tests.Rules.BadPractice.csproj | 2 +- .../Gendarme.Rules.Concurrency.csproj | 2 +- .../Test/Tests.Rules.Concurrency.csproj | 2 +- .../Gendarme.Rules.Correctness.csproj | 2 +- .../Test/Tests.Rules.Correctness.csproj | 32 +-- .../Gendarme.Rules.Design.Generic.csproj | 2 +- .../Test/Tests.Rules.Design.Generic.csproj | 2 +- .../Gendarme.Rules.Design.Linq.csproj | 2 +- .../Test/Tests.Rules.Design.Linq.csproj | 2 +- .../Gendarme.Rules.Design.csproj | 2 +- .../Test/Tests.Rules.Design.csproj | 2 +- .../Gendarme.Rules.Exceptions.csproj | 2 +- .../Test/Tests.Rules.Exceptions.csproj | 2 +- .../Gendarme.Rules.Interoperability.csproj | 2 +- .../Test/Tests.Rules.Interoperability.csproj | 2 +- .../Gendarme.Rules.Maintainability.csproj | 2 +- .../Test/Tests.Rules.Maintainability.csproj | 2 +- .../Gendarme.Rules.Naming.csproj | 2 +- .../Test/Tests.Rules.Naming.csproj | 2 +- .../Gendarme.Rules.Performance.csproj | 2 +- .../Test/Tests.Rules.Performance.csproj | 2 +- .../Gendarme.Rules.Portability.csproj | 2 +- .../Test/Tests.Rules.Portability.csproj | 2 +- .../Gendarme.Rules.Security.Cas.csproj | 2 +- .../Test/Tests.Rules.Security.Cas.csproj | 2 +- .../Gendarme.Rules.Security.csproj | 2 +- .../Test/Tests.Rules.Security.csproj | 2 +- .../Gendarme.Rules.Serialization.csproj | 2 +- .../Test/Tests.Rules.Serialization.csproj | 2 +- .../Gendarme.Rules.Smells.csproj | 2 +- .../Test/Tests.Rules.Smells.csproj | 2 +- .../Gendarme.Rules.Ui/Gendarme.Rules.Ui.csproj | 2 +- .../Gendarme.Rules.Ui/Test/Tests.Rules.Ui.csproj | 2 +- gendarme/rules/Test.Rules/Test.Rules.csproj | 2 +- .../swf-wizard-runner/swf-wizard-runner.csproj | 2 +- gendarme/tools/unsupported/typeref/typeref.csproj | 110 ++++---- gendarme/wix/Product.wxs | 27 +- gendarme/wix/wix.wixproj | 3 + 44 files changed, 282 insertions(+), 279 deletions(-) diff --git a/gendarme/AssemblyStaticInfo.cs b/gendarme/AssemblyStaticInfo.cs index 323b2e27..397a2ff8 100644 --- a/gendarme/AssemblyStaticInfo.cs +++ b/gendarme/AssemblyStaticInfo.cs @@ -23,5 +23,5 @@ using System.Security.Permissions; [assembly: ComVisible (false)] #if RELEASE -[assembly: AssemblyVersion ("2.7.0.0")] +[assembly: AssemblyVersion ("2.8.0.0")] #endif diff --git a/gendarme/console/gendarme.csproj b/gendarme/console/gendarme.csproj index c987b51c..2a827e22 100755 --- a/gendarme/console/gendarme.csproj +++ b/gendarme/console/gendarme.csproj @@ -80,7 +80,7 @@ {4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E} Mono.Cecil.Pdb - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/framework/Gendarme.Framework.csproj b/gendarme/framework/Gendarme.Framework.csproj index 3031c21d..f412f8c0 100755 --- a/gendarme/framework/Gendarme.Framework.csproj +++ b/gendarme/framework/Gendarme.Framework.csproj @@ -1,161 +1,161 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {CD6818D5-B398-486C-B180-92A07B143AFD} - Library - Properties - Gendarme.Framework - Gendarme.Framework - - - 2.0 - - - http://localhost/Gendarme.Framework/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - true - false - true - v3.5 - - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 3 - - - - pdbonly - true - bin\Release\ - TRACE;RELEASE - prompt - 4 - - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - - - False - - - False - - - - - {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} - Mono.Cecil - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {CD6818D5-B398-486C-B180-92A07B143AFD} + Library + Properties + Gendarme.Framework + Gendarme.Framework + + + 2.0 + + + http://localhost/Gendarme.Framework/ + true + Web + true + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + true + false + true + v3.5 + + + true + full + false + ..\bin\ + DEBUG;TRACE + prompt + 3 + + + + pdbonly + true + bin\Release\ + TRACE;RELEASE + prompt + 4 + + + + + + 3.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + + + False + + + False + + + + + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} + Mono.Cecil + + + - - - - - - - - - - - - - - - - - + --> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gendarme/framework/Test/Tests.Framework.csproj b/gendarme/framework/Test/Tests.Framework.csproj index 87dfe35a..c9df47a2 100755 --- a/gendarme/framework/Test/Tests.Framework.csproj +++ b/gendarme/framework/Test/Tests.Framework.csproj @@ -55,7 +55,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/gendarme-win.sln b/gendarme/gendarme-win.sln index 2a4d020e..d2a39955 100755 --- a/gendarme/gendarme-win.sln +++ b/gendarme/gendarme-win.sln @@ -79,7 +79,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gendarme.Framework", "frame EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cecil", "Cecil", "{10772645-2837-44B1-9CFA-51A0A5CAC635}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj", "{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj", "{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "..\..\cecil\pdb\Mono.Cecil.Pdb\Mono.Cecil.Pdb.csproj", "{4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E}" EndProject @@ -106,6 +106,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "wix\wix.wixproj", "{ ProjectSection(ProjectDependencies) = postProject {5446570C-A304-418D-B908-91ADA51E4F00} = {5446570C-A304-418D-B908-91ADA51E4F00} {3A220513-3E53-4E13-B25D-2202F79B4C47} = {3A220513-3E53-4E13-B25D-2202F79B4C47} + {627AA224-D043-4CF4-A783-72546E6ACFDD} = {627AA224-D043-4CF4-A783-72546E6ACFDD} + {4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E} = {4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E} {EEC7B836-DB9D-4CB3-9829-53C223C9411F} = {EEC7B836-DB9D-4CB3-9829-53C223C9411F} {237A273E-BCAF-42DB-9DE5-1697B016C648} = {237A273E-BCAF-42DB-9DE5-1697B016C648} {949C4D51-4581-402A-AC18-B1B41F395FDA} = {949C4D51-4581-402A-AC18-B1B41F395FDA} @@ -124,6 +126,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "wix\wix.wixproj", "{ {732905E1-1FD4-403A-93DD-EC4CF120091E} = {732905E1-1FD4-403A-93DD-EC4CF120091E} {7A8D4AE7-66FA-42E0-BDCB-400D8E0ECFA6} = {7A8D4AE7-66FA-42E0-BDCB-400D8E0ECFA6} {BDDBA1F9-061B-45BE-86B5-98571F7B0383} = {BDDBA1F9-061B-45BE-86B5-98571F7B0383} + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} = {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{A208E677-6A00-4F5C-A15B-5CCA90AB78FF}" diff --git a/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj b/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj index 39d5b341..c1a26b32 100755 --- a/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj +++ b/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj @@ -70,7 +70,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj b/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj index 71d780fe..4cb3e1be 100755 --- a/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj +++ b/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj @@ -61,7 +61,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj b/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj index 58e38c0d..7cc30b77 100644 --- a/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj +++ b/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj @@ -80,7 +80,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj b/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj index 1663f855..f8fa060e 100755 --- a/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj +++ b/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj @@ -72,7 +72,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj b/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj index c1f405f8..d8a39215 100755 --- a/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj +++ b/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj @@ -119,7 +119,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil diff --git a/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj b/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj index 005e2df4..a0f1b927 100755 --- a/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj +++ b/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj @@ -80,12 +80,12 @@ - - - True - True - Resource.resx - + + + True + True + Resource.resx + @@ -98,7 +98,7 @@ - + {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} Mono.Cecil @@ -125,14 +125,14 @@ False - - - - ResXFileCodeGenerator - Resource.Designer.cs - Designer - - + + + + ResXFileCodeGenerator + Resource.Designer.cs + Designer + + + --> \ No newline at end of file diff --git a/gendarme/wix/Product.wxs b/gendarme/wix/Product.wxs index 6afd9ecb..329b0682 100644 --- a/gendarme/wix/Product.wxs +++ b/gendarme/wix/Product.wxs @@ -1,9 +1,9 @@ - - + + - + @@ -15,12 +15,6 @@ - - - - Installed OR NETFRAMEWORK35 - - @@ -31,9 +25,9 @@ - + - + @@ -87,13 +81,16 @@ + + - - - - + + + + + INSTALLLOCATION diff --git a/gendarme/wix/wix.wixproj b/gendarme/wix/wix.wixproj index 547ac43c..57cf6cb9 100644 --- a/gendarme/wix/wix.wixproj +++ b/gendarme/wix/wix.wixproj @@ -17,6 +17,9 @@ bin\$(Configuration)\ obj\$(Configuration)\ + False + False + False -- cgit v1.2.3