Skip to content

Commit cb46346

Browse files
authored
Merge pull request #33 from perpetualKid/NetFX-Upgrade-4.7.2
Upgrade all projects to target NetFX 4.7.2 https://blueprints.launchpad.net/or/+spec/dotnet-4 https://trello.com/c/eTowjYMv/407-upgrade-to-net-framework-472
2 parents 15747a1 + ebc1684 commit cb46346

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+245
-326
lines changed

Source/3rdPartyLibs/GNU.Getopt.dll

-512 Bytes
Binary file not shown.
-512 Bytes
Binary file not shown.
-1 KB
Binary file not shown.
0 Bytes
Binary file not shown.
-8.5 KB
Binary file not shown.

Source/ContentChecker/ContentChecker.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>ContentChecker</RootNamespace>
1010
<AssemblyName>ContentChecker</AssemblyName>
11-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<TargetFrameworkProfile />
@@ -21,6 +21,7 @@
2121
<PlatformTarget>x86</PlatformTarget>
2222
<ErrorReport>prompt</ErrorReport>
2323
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
24+
<Prefer32Bit>false</Prefer32Bit>
2425
<LangVersion>7.3</LangVersion>
2526
</PropertyGroup>
2627
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
@@ -31,6 +32,7 @@
3132
<PlatformTarget>x86</PlatformTarget>
3233
<ErrorReport>prompt</ErrorReport>
3334
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
35+
<Prefer32Bit>false</Prefer32Bit>
3436
<LangVersion>7.3</LangVersion>
3537
</PropertyGroup>
3638
<PropertyGroup>
@@ -40,12 +42,7 @@
4042
<Reference Include="Microsoft.Xna.Framework, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86" />
4143
<Reference Include="Microsoft.Xna.Framework.Game, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86" />
4244
<Reference Include="System" />
43-
<Reference Include="System.Core" />
4445
<Reference Include="System.Windows.Forms" />
45-
<Reference Include="System.Xml.Linq" />
46-
<Reference Include="System.Data.DataSetExtensions" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
4946
</ItemGroup>
5047
<ItemGroup>
5148
<Compile Include="ConsistLoader.cs" />
@@ -115,5 +112,8 @@
115112
<Name>RunActivity</Name>
116113
</ProjectReference>
117114
</ItemGroup>
115+
<ItemGroup>
116+
<None Include="app.config" />
117+
</ItemGroup>
118118
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119119
</Project>

Source/ContentChecker/app.config

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

Source/Contrib/ActivityEditor/AEWizard/AEWizard.csproj

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AEWizard</RootNamespace>
1111
<AssemblyName>Contrib.AEWizard</AssemblyName>
12-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1617
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<ErrorReport>prompt</ErrorReport>
2223
<WarningLevel>4</WarningLevel>
2324
<PlatformTarget>x86</PlatformTarget>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
<LangVersion>7.3</LangVersion>
2527
</PropertyGroup>
2628
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
@@ -31,23 +33,13 @@
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
3335
<PlatformTarget>x86</PlatformTarget>
36+
<Prefer32Bit>false</Prefer32Bit>
3437
<LangVersion>7.3</LangVersion>
3538
</PropertyGroup>
3639
<ItemGroup>
3740
<Reference Include="System" />
38-
<Reference Include="System.Core">
39-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
40-
</Reference>
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Data.DataSetExtensions">
43-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
44-
</Reference>
4541
<Reference Include="System.Drawing" />
4642
<Reference Include="System.Windows.Forms" />
47-
<Reference Include="System.Xml" />
48-
<Reference Include="System.Xml.Linq">
49-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
50-
</Reference>
5143
</ItemGroup>
5244
<ItemGroup>
5345
<Compile Include="SelectRoute.cs">

Source/Contrib/ActivityEditor/AEWizard/Properties/Resources.Designer.cs

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

Source/Contrib/ActivityEditor/AEWizard/Properties/Settings.Designer.cs

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

0 commit comments

Comments
 (0)