Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit 0edbcf9

Browse files
RubenWillemsRubenWillems
committed
Merge pull request #208 from poseyj/master
change target framework to .net 4.5
2 parents 35e0bf3 + 9fc3798 commit 0edbcf9

31 files changed

+259
-128
lines changed

‎project/CCCmd/CCCmd.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ThoughtWorks.CruiseControl.CCCmd</RootNamespace>
1212
<AssemblyName>CCCmd</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -42,6 +43,7 @@
4243
<WarningLevel>4</WarningLevel>
4344
<NoWarn>1591</NoWarn>
4445
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
46+
<Prefer32Bit>false</Prefer32Bit>
4547
</PropertyGroup>
4648
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
4749
<DebugSymbols>true</DebugSymbols>
@@ -53,6 +55,7 @@
5355
<WarningLevel>4</WarningLevel>
5456
<NoWarn>1591</NoWarn>
5557
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
58+
<Prefer32Bit>false</Prefer32Bit>
5659
</PropertyGroup>
5760
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5861
<DebugType>pdbonly</DebugType>
@@ -63,6 +66,7 @@
6366
<WarningLevel>4</WarningLevel>
6467
<NoWarn>1591</NoWarn>
6568
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
69+
<Prefer32Bit>false</Prefer32Bit>
6670
</PropertyGroup>
6771
<ItemGroup>
6872
<Reference Include="System" />
@@ -103,6 +107,9 @@
103107
<Install>true</Install>
104108
</BootstrapperPackage>
105109
</ItemGroup>
110+
<ItemGroup>
111+
<None Include="app.config" />
112+
</ItemGroup>
106113
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
107114
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
108115
Other similar extension points exist, see Microsoft.Common.targets.

‎project/CCCmd/app.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎project/CCNet.CSharpDemos.Plugin/CCNet.CSharpDemos.Plugin.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>CCNet.CSharpDemos.Plugin</RootNamespace>
1212
<AssemblyName>CCNet.CSharpDemos.Plugin</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -41,6 +42,7 @@
4142
<ErrorReport>prompt</ErrorReport>
4243
<WarningLevel>4</WarningLevel>
4344
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
45+
<Prefer32Bit>false</Prefer32Bit>
4446
</PropertyGroup>
4547
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4648
<DebugType>pdbonly</DebugType>
@@ -50,6 +52,7 @@
5052
<ErrorReport>prompt</ErrorReport>
5153
<WarningLevel>4</WarningLevel>
5254
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
55+
<Prefer32Bit>false</Prefer32Bit>
5356
</PropertyGroup>
5457
<ItemGroup>
5558
<Reference Include="NetReflector, Version=1.1.2009.1214, Culture=neutral, PublicKeyToken=2f4dd8b32acbcd8e, processorArchitecture=MSIL">

‎project/CCNet.VBDemos.Plugin/CCNet.VBDemos.Plugin.vbproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>CCNet.VBDemos.Plugin</AssemblyName>
1212
<FileAlignment>512</FileAlignment>
1313
<MyType>Windows</MyType>
14-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1515
<OptionExplicit>On</OptionExplicit>
1616
<OptionCompare>Binary</OptionCompare>
1717
<OptionStrict>Off</OptionStrict>
@@ -35,6 +35,7 @@
3535
<IsWebBootstrapper>false</IsWebBootstrapper>
3636
<UseApplicationTrust>false</UseApplicationTrust>
3737
<BootstrapperEnabled>true</BootstrapperEnabled>
38+
<TargetFrameworkProfile />
3839
</PropertyGroup>
3940
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4041
<DebugSymbols>true</DebugSymbols>
@@ -45,6 +46,7 @@
4546
<DocumentationFile>CCNet.VBDemos.Plugin.xml</DocumentationFile>
4647
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
4748
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
49+
<Prefer32Bit>false</Prefer32Bit>
4850
</PropertyGroup>
4951
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5052
<DebugType>pdbonly</DebugType>
@@ -55,6 +57,7 @@
5557
<DocumentationFile>CCNet.VBDemos.Plugin.xml</DocumentationFile>
5658
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
5759
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
60+
<Prefer32Bit>false</Prefer32Bit>
5861
</PropertyGroup>
5962
<ItemGroup>
6063
<Reference Include="NetReflector, Version=1.1.2009.1214, Culture=neutral, PublicKeyToken=2f4dd8b32acbcd8e, processorArchitecture=MSIL">

‎project/CCNet.VBDemos.Plugin/My Project/Application.Designer.vb

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/CCNet.VBDemos.Plugin/My Project/Resources.Designer.vb

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/CCNet.VBDemos.Plugin/My Project/Settings.Designer.vb

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/CCTray/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<configuration>
33
<startup>
4-
</startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
55
</configuration>

‎project/CCTray/CCTray.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<UpgradeBackupLocation>
2828
</UpgradeBackupLocation>
2929
<OldToolsVersion>3.5</OldToolsVersion>
30-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
30+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
3131
<PublishUrl>publish\</PublishUrl>
3232
<Install>true</Install>
3333
<InstallFrom>Disk</InstallFrom>
@@ -43,6 +43,7 @@
4343
<IsWebBootstrapper>false</IsWebBootstrapper>
4444
<UseApplicationTrust>false</UseApplicationTrust>
4545
<BootstrapperEnabled>true</BootstrapperEnabled>
46+
<TargetFrameworkProfile />
4647
</PropertyGroup>
4748
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4849
<OutputPath>bin\Debug\</OutputPath>
@@ -66,6 +67,7 @@
6667
<DebugType>full</DebugType>
6768
<ErrorReport>prompt</ErrorReport>
6869
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
70+
<Prefer32Bit>false</Prefer32Bit>
6971
</PropertyGroup>
7072
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
7173
<OutputPath>..\..\Build\CCTray\</OutputPath>
@@ -89,6 +91,7 @@
8991
<DebugType>none</DebugType>
9092
<ErrorReport>prompt</ErrorReport>
9193
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
94+
<Prefer32Bit>false</Prefer32Bit>
9295
</PropertyGroup>
9396
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
9497
<OutputPath>..\..\Build\CCTray\</OutputPath>
@@ -112,6 +115,7 @@
112115
<DebugType>full</DebugType>
113116
<ErrorReport>prompt</ErrorReport>
114117
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
118+
<Prefer32Bit>false</Prefer32Bit>
115119
</PropertyGroup>
116120
<ItemGroup>
117121
<Reference Include="System">

‎project/CCTrayLib/CCTrayLib.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<UpgradeBackupLocation>
2929
</UpgradeBackupLocation>
3030
<OldToolsVersion>3.5</OldToolsVersion>
31-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
31+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
3232
<PublishUrl>publish\</PublishUrl>
3333
<Install>true</Install>
3434
<InstallFrom>Disk</InstallFrom>
@@ -44,6 +44,7 @@
4444
<IsWebBootstrapper>false</IsWebBootstrapper>
4545
<UseApplicationTrust>false</UseApplicationTrust>
4646
<BootstrapperEnabled>true</BootstrapperEnabled>
47+
<TargetFrameworkProfile />
4748
</PropertyGroup>
4849
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4950
<OutputPath>bin\Debug\</OutputPath>
@@ -67,6 +68,7 @@
6768
<DebugType>full</DebugType>
6869
<ErrorReport>prompt</ErrorReport>
6970
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
71+
<Prefer32Bit>false</Prefer32Bit>
7072
</PropertyGroup>
7173
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
7274
<OutputPath>..\..\Build\CCTray\</OutputPath>
@@ -90,6 +92,7 @@
9092
<DebugType>none</DebugType>
9193
<ErrorReport>prompt</ErrorReport>
9294
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
95+
<Prefer32Bit>false</Prefer32Bit>
9396
</PropertyGroup>
9497
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
9598
<OutputPath>..\..\Build\CCTray\</OutputPath>
@@ -114,6 +117,7 @@
114117
<DebugType>full</DebugType>
115118
<ErrorReport>prompt</ErrorReport>
116119
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
120+
<Prefer32Bit>false</Prefer32Bit>
117121
</PropertyGroup>
118122
<PropertyGroup Condition="$(DISABLE_COM) == true">
119123
<DefineConstants>DISABLE_COM</DefineConstants>

0 commit comments

Comments
 (0)