Skip to content

Commit a5bebc3

Browse files
author
SlavaRa
authored
[.NET] Migrate to .NET5. Step 1. <Project DefaultTargets="Build" -> <Project Sdk="Microsoft.NET.Sdk"> (fdorg#3204)
1 parent 076ae10 commit a5bebc3

68 files changed

Lines changed: 4956 additions & 6016 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ Thumbs.db
3636
/FlashDevelop/Bin/Debug/Mono.*
3737
/packages/
3838
/PluginCore/Bin
39+
FlashDevelop/Bin/Debug/LitJSON.*

‎CI/build.cmd‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
call SetVersion.bat
1313

1414
:: Build the main solution and run tests
15-
msbuild FlashDevelop.sln /p:Configuration=Debug+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger%
15+
msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger%
1616

1717
:: Check for build errors
1818
if %errorlevel% neq 0 goto :error
@@ -33,21 +33,24 @@ if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1
3333
:: Check for build errors
3434
if %errorlevel% neq 0 goto :error
3535

36-
:: Remove testing binaries so we can reuse the current build
37-
del "FlashDevelop\Bin/Debug\*.Tests.*" /Q
38-
del "FlashDevelop\Bin/Debug\NSubstitute.*" /Q
39-
del "FlashDevelop\Bin/Debug\nunit.framework.*" /Q
40-
del "FlashDevelop\Bin/Debug\Castle.Core.*" /Q
36+
git clean -xfd
37+
38+
nuget restore FlashDevelop.sln
39+
40+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="x86" /t:Rebuild %MSBuildLogger%
41+
42+
:: Check for build errors
43+
if %errorlevel% neq 0 goto :error
4144

4245
:: Build AnyCPU version for 64bits support
4346
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Build %MSBuildLogger%
4447

4548
:: Check for build errors
4649
if %errorlevel% neq 0 goto :error
4750

51+
:: Remove files after build
4852
del "FlashDevelop\Bin/Debug\System.*" /Q
4953
del "FlashDevelop\Bin/Debug\Microsoft.*" /Q
50-
del "FlashDevelop\Bin/Debug\CSScriptLibrary.xml" /Q
5154
del "FlashDevelop\Bin/Debug\Mono.CSharp.*" /Q
5255

5356
:: Create the installer
@@ -90,19 +93,18 @@ msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
9093
:: Check for build errors
9194
if %errorlevel% neq 0 goto :error
9295

96+
:: Remove files after build
97+
del "FlashDevelop\Bin\Debug\Plugins\CodeAnalyzer.dll" /q
98+
del "FlashDevelop\Bin/Debug\System.*" /Q
99+
del "FlashDevelop\Bin/Debug\Microsoft.*" /Q
100+
del "FlashDevelop\Bin/Debug\Mono.CSharp.*" /Q
101+
93102
:: Rename binaries
94103
ren FlashDevelop\Bin\Debug\FlashDevelop.exe HaxeDevelop.exe
95104
ren FlashDevelop\Bin\Debug\FlashDevelop64.exe HaxeDevelop64.exe
96105
ren FlashDevelop\Bin\Debug\FlashDevelop.exe.config HaxeDevelop.exe.config
97106
ren FlashDevelop\Bin\Debug\FlashDevelop64.exe.config HaxeDevelop64.exe.config
98107

99-
: Remove files after build
100-
del "FlashDevelop\Bin\Debug\Plugins\CodeAnalyzer.dll" /q
101-
del "FlashDevelop\Bin/Debug\System.*" /Q
102-
del "FlashDevelop\Bin/Debug\Microsoft.*" /Q
103-
del "FlashDevelop\Bin/Debug\CSScriptLibrary.xml" /Q
104-
del "FlashDevelop\Bin/Debug\Mono.CSharp.*" /Q
105-
106108
:: Check for build errors
107109
if %errorlevel% neq 0 goto :error
108110

‎External/3rdParty/Aga-1.7/Aga.Controls/Aga.Controls.csproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -22,7 +22,11 @@
2222
</FileUpgradeFlags>
2323
<UpgradeBackupLocation>
2424
</UpgradeBackupLocation>
25-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
25+
<TargetFramework>net48</TargetFramework>
26+
<UseWindowsForms>true</UseWindowsForms>
27+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
28+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
29+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
2630
<TargetFrameworkProfile />
2731
</PropertyGroup>
2832
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -235,12 +239,4 @@
235239
<ItemGroup>
236240
<Content Include="Resources\DVSplit.cur" />
237241
</ItemGroup>
238-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
239-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
240-
Other similar extension points exist, see Microsoft.Common.targets.
241-
<Target Name="BeforeBuild">
242-
</Target>
243-
<Target Name="AfterBuild">
244-
</Target>
245-
-->
246242
</Project>

‎External/3rdParty/Duplicate/Duplicate.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
</StartupObject>
1313
<FileUpgradeFlags>
1414
</FileUpgradeFlags>
15-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
15+
<TargetFramework>net48</TargetFramework>
16+
<UseWindowsForms>true</UseWindowsForms>
17+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
18+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
19+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1620
<UpgradeBackupLocation>
1721
</UpgradeBackupLocation>
1822
<TargetFrameworkSubset>
@@ -47,14 +51,6 @@
4751
<DefineConstants>TRACE</DefineConstants>
4852
<Optimize>true</Optimize>
4953
</PropertyGroup>
50-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
51-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
52-
Other similar extension points exist, see Microsoft.Common.targets.
53-
<Target Name="BeforeBuild">
54-
</Target>
55-
<Target Name="AfterBuild">
56-
</Target>
57-
-->
5854
<ItemGroup>
5955
<Reference Include="PluginCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
6056
<SpecificVersion>False</SpecificVersion>

‎External/3rdParty/Trace/Trace.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
</StartupObject>
1313
<FileUpgradeFlags>
1414
</FileUpgradeFlags>
15-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
15+
<TargetFramework>net48</TargetFramework>
16+
<UseWindowsForms>true</UseWindowsForms>
17+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
18+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
19+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1620
<UpgradeBackupLocation>
1721
</UpgradeBackupLocation>
1822
<TargetFrameworkSubset>
@@ -62,14 +66,6 @@
6266
<DefineConstants>TRACE</DefineConstants>
6367
<Optimize>true</Optimize>
6468
</PropertyGroup>
65-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
66-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
67-
Other similar extension points exist, see Microsoft.Common.targets.
68-
<Target Name="BeforeBuild">
69-
</Target>
70-
<Target Name="AfterBuild">
71-
</Target>
72-
-->
7369
<ItemGroup>
7470
<Reference Include="PluginCore, Version=2.0.0.0, Culture=neutral, processorArchitecture=x86">
7571
<SpecificVersion>False</SpecificVersion>

‎External/Archive/FlashDebugger/FlashDebugger.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
</StartupObject>
1313
<FileUpgradeFlags>
1414
</FileUpgradeFlags>
15-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
15+
<TargetFramework>net48</TargetFramework>
16+
<UseWindowsForms>true</UseWindowsForms>
17+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
18+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
19+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1620
<UpgradeBackupLocation>
1721
</UpgradeBackupLocation>
1822
</PropertyGroup>
@@ -46,14 +50,6 @@
4650
<DefineConstants>TRACE</DefineConstants>
4751
<Optimize>true</Optimize>
4852
</PropertyGroup>
49-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
50-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
51-
Other similar extension points exist, see Microsoft.Common.targets.
52-
<Target Name="BeforeBuild">
53-
</Target>
54-
<Target Name="AfterBuild">
55-
</Target>
56-
-->
5753
<ItemGroup>
5854
<Reference Include="Aga, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
5955
<SpecificVersion>False</SpecificVersion>

‎External/Plugins/AS2Context/AS2Context.csproj‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,14 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>AS2Context</RootNamespace>
1010
<AssemblyName>AS2Context</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
11+
<TargetFramework>net48</TargetFramework>
12+
<UseWindowsForms>true</UseWindowsForms>
13+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
14+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
15+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
16+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
17+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
18+
<Platforms>x64;x86;AnyCPU</Platforms>
1219
</PropertyGroup>
1320
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1421
<DebugSymbols>true</DebugSymbols>
@@ -58,14 +65,11 @@
5865
<LangVersion>9</LangVersion>
5966
<ErrorReport>prompt</ErrorReport>
6067
</PropertyGroup>
61-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
62-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
63-
Other similar extension points exist, see Microsoft.Common.targets.
64-
<Target Name="BeforeBuild">
65-
</Target>
66-
<Target Name="AfterBuild">
67-
</Target>
68-
-->
68+
<ItemGroup>
69+
<Reference Include="System" />
70+
<Reference Include="System.Drawing" />
71+
<Reference Include="System.Windows.Forms" />
72+
</ItemGroup>
6973
<ItemGroup>
7074
<Compile Include="AS2Settings.cs" />
7175
<Compile Include="Context.cs" />
@@ -84,9 +88,4 @@
8488
<Private>False</Private>
8589
</ProjectReference>
8690
</ItemGroup>
87-
<ItemGroup>
88-
<Reference Include="System" />
89-
<Reference Include="System.Drawing" />
90-
<Reference Include="System.Windows.Forms" />
91-
</ItemGroup>
9291
</Project>

0 commit comments

Comments
 (0)