Skip to content

Commit 8bf09ce

Browse files
jpobstjpobst
authored
Merge pull request #340 from mono/sdk-style
Convert csproj files to SDK style.
2 parents 6e6c464 + 545c911 commit 8bf09ce

File tree

4 files changed

+40
-348
lines changed

4 files changed

+40
-348
lines changed

‎Mono.Debugger.Soft/Mono.Debugger.Soft.csproj

Lines changed: 9 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,31 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.21022</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>Mono.Debugger.Soft</RootNamespace>
11-
<AssemblyName>Mono.Debugger.Soft</AssemblyName>
4+
<TargetFramework>net472</TargetFramework>
125
<SignAssembly>True</SignAssembly>
136
<AssemblyOriginatorKeyFile>mono.snk</AssemblyOriginatorKeyFile>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>True</DebugSymbols>
17-
<DebugType>embedded</DebugType>
18-
<Optimize>False</Optimize>
19-
<OutputPath>bin\Debug</OutputPath>
207
<DefineConstants>MONO_DATACONVERTER_STATIC_METHODS;ENABLE_CECIL</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<ConsolePause>False</ConsolePause>
248
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
279
<DebugSymbols>True</DebugSymbols>
2810
<DebugType>embedded</DebugType>
29-
<Optimize>True</Optimize>
30-
<OutputPath>bin\Release</OutputPath>
31-
<ErrorReport>prompt</ErrorReport>
3211
<WarningLevel>4</WarningLevel>
3312
<ConsolePause>False</ConsolePause>
34-
<DefineConstants>MONO_DATACONVERTER_STATIC_METHODS;ENABLE_CECIL</DefineConstants>
35-
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
3613
</PropertyGroup>
14+
3715
<Import Project="..\Mono.Debugging.settings" />
38-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
39-
<ItemGroup>
40-
<Compile Include="Mono.Debugger.Soft\AbsentInformationException.cs" />
41-
<Compile Include="Mono.Debugger.Soft\AppDomainCreateEvent.cs" />
42-
<Compile Include="Mono.Debugger.Soft\AppDomainMirror.cs" />
43-
<Compile Include="Mono.Debugger.Soft\AppDomainUnloadEvent.cs" />
44-
<Compile Include="Mono.Debugger.Soft\ArrayMirror.cs" />
45-
<Compile Include="Mono.Debugger.Soft\AssemblyLoadEvent.cs" />
46-
<Compile Include="Mono.Debugger.Soft\AssemblyMirror.cs" />
47-
<Compile Include="Mono.Debugger.Soft\AssemblyUnloadEvent.cs" />
48-
<Compile Include="Mono.Debugger.Soft\BreakpointEvent.cs" />
49-
<Compile Include="Mono.Debugger.Soft\BreakpointEventRequest.cs" />
50-
<Compile Include="Mono.Debugger.Soft\Connection.cs" />
51-
<Compile Include="Mono.Debugger.Soft\CrashEvent.cs" />
52-
<Compile Include="Mono.Debugger.Soft\CustomAttributeDataMirror.cs" />
53-
<Compile Include="Mono.Debugger.Soft\CustomAttributeNamedArgumentMirror.cs" />
54-
<Compile Include="Mono.Debugger.Soft\CustomAttributeTypedArgumentMirror.cs" />
55-
<Compile Include="Mono.Debugger.Soft\DataConverter.cs" />
56-
<Compile Include="Mono.Debugger.Soft\EnumMirror.cs" />
57-
<Compile Include="Mono.Debugger.Soft\Event.cs" />
58-
<Compile Include="Mono.Debugger.Soft\EventQueueImpl.cs" />
59-
<Compile Include="Mono.Debugger.Soft\EventRequest.cs" />
60-
<Compile Include="Mono.Debugger.Soft\EventSet.cs" />
61-
<Compile Include="Mono.Debugger.Soft\EventType.cs" />
62-
<Compile Include="Mono.Debugger.Soft\ExceptionEvent.cs" />
63-
<Compile Include="Mono.Debugger.Soft\ExceptionEventRequest.cs" />
64-
<Compile Include="Mono.Debugger.Soft\FieldInfoMirror.cs" />
65-
<Compile Include="Mono.Debugger.Soft\IInvokeAsyncResult.cs" />
66-
<Compile Include="Mono.Debugger.Soft\ILExceptionHandler.cs" />
67-
<Compile Include="Mono.Debugger.Soft\ILInstruction.cs" />
68-
<Compile Include="Mono.Debugger.Soft\ILInterpreter.cs" />
69-
<Compile Include="Mono.Debugger.Soft\IMirror.cs" />
70-
<Compile Include="Mono.Debugger.Soft\InterfaceMappingMirror.cs" />
71-
<Compile Include="Mono.Debugger.Soft\InvalidStackFrameException.cs" />
72-
<Compile Include="Mono.Debugger.Soft\InvocationException.cs" />
73-
<Compile Include="Mono.Debugger.Soft\InvokeOptions.cs" />
74-
<Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" />
75-
<Compile Include="Mono.Debugger.Soft\LocalVariable.cs" />
76-
<Compile Include="Mono.Debugger.Soft\Location.cs" />
77-
<Compile Include="Mono.Debugger.Soft\MethodBodyMirror.cs" />
78-
<Compile Include="Mono.Debugger.Soft\MethodEntryEvent.cs" />
79-
<Compile Include="Mono.Debugger.Soft\MethodEntryEventRequest.cs" />
80-
<Compile Include="Mono.Debugger.Soft\MethodExitEvent.cs" />
81-
<Compile Include="Mono.Debugger.Soft\MethodExitEventRequest.cs" />
82-
<Compile Include="Mono.Debugger.Soft\MethodMirror.cs" />
83-
<Compile Include="Mono.Debugger.Soft\Mirror.cs" />
84-
<Compile Include="Mono.Debugger.Soft\ModuleMirror.cs" />
85-
<Compile Include="Mono.Debugger.Soft\ObjectCollectedException.cs" />
86-
<Compile Include="Mono.Debugger.Soft\ObjectMirror.cs" />
87-
<Compile Include="Mono.Debugger.Soft\ParameterInfoMirror.cs" />
88-
<Compile Include="Mono.Debugger.Soft\PrimitiveValue.cs" />
89-
<Compile Include="Mono.Debugger.Soft\PropertyInfoMirror.cs" />
90-
<Compile Include="Mono.Debugger.Soft\StackFrame.cs" />
91-
<Compile Include="Mono.Debugger.Soft\StepEvent.cs" />
92-
<Compile Include="Mono.Debugger.Soft\StepEventRequest.cs" />
93-
<Compile Include="Mono.Debugger.Soft\StringMirror.cs" />
94-
<Compile Include="Mono.Debugger.Soft\StructMirror.cs" />
95-
<Compile Include="Mono.Debugger.Soft\SuspendPolicy.cs" />
96-
<Compile Include="Mono.Debugger.Soft\ThreadDeathEvent.cs" />
97-
<Compile Include="Mono.Debugger.Soft\ThreadMirror.cs" />
98-
<Compile Include="Mono.Debugger.Soft\ThreadStartEvent.cs" />
99-
<Compile Include="Mono.Debugger.Soft\TypeLoadEvent.cs" />
100-
<Compile Include="Mono.Debugger.Soft\TypeLoadEventRequest.cs" />
101-
<Compile Include="Mono.Debugger.Soft\TypeMirror.cs" />
102-
<Compile Include="Mono.Debugger.Soft\UserBreakEvent.cs" />
103-
<Compile Include="Mono.Debugger.Soft\UserLogEvent.cs" />
104-
<Compile Include="Mono.Debugger.Soft\Value.cs" />
105-
<Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />
106-
<Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />
107-
<Compile Include="Mono.Debugger.Soft\VMDeathEvent.cs" />
108-
<Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" />
109-
<Compile Include="Mono.Debugger.Soft\VMDisconnectEvent.cs" />
110-
<Compile Include="Mono.Debugger.Soft\VMMismatchException.cs" />
111-
<Compile Include="Mono.Debugger.Soft\VMStartEvent.cs" />
112-
<Compile Include="Mono.Debugger.Soft\AssemblyLoadEventRequest.cs" />
113-
<Compile Include="Locale.cs" />
114-
<Compile Include="Mono.Debugger.Soft\PointerValue.cs" />
115-
<Compile Include="Mono.Debugger.Soft\LocalScope.cs" />
116-
<Compile Include="Mono.Debugger.Soft\DelayedLambdaValue.cs" />
117-
<Compile Include="Mono.Debugger.Soft\DelayedLambdaType.cs" />
118-
</ItemGroup>
16+
11917
<ItemGroup>
12018
<None Include="Makefile.am" />
12119
<None Include="mono-git-revision" />
12220
</ItemGroup>
21+
12322
<PropertyGroup>
12423
<NuGetVersionCecil Condition="$(NuGetVersionCecil) == ''">0.10.1</NuGetVersionCecil>
12524
</PropertyGroup>
25+
12626
<ItemGroup>
12727
<PackageReference Include="Mono.Cecil" Version="$(NuGetVersionCecil)" PrivateAssets="all" />
28+
<PackageReference Include="System.Runtime" Version="4.3.1" />
12829
</ItemGroup>
129-
<ItemGroup>
130-
<Reference Include="System.Core" />
131-
<Reference Include="System" />
132-
</ItemGroup>
30+
13331
</Project>

‎Mono.Debugging.Soft/AssemblyInfo.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎Mono.Debugging.Soft/Mono.Debugging.Soft.csproj

Lines changed: 16 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,41 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<RootNamespace>Mono.Debugging.Soft</RootNamespace>
9-
<AssemblyName>Mono.Debugging.Soft</AssemblyName>
4+
<TargetFramework>net472</TargetFramework>
105
<SignAssembly>True</SignAssembly>
116
<AssemblyOriginatorKeyFile>..\Mono.Debugging\mono.debugging.snk</AssemblyOriginatorKeyFile>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15-
<DebugSymbols>True</DebugSymbols>
16-
<DebugType>embedded</DebugType>
17-
<Optimize>False</Optimize>
18-
<OutputPath>bin\Debug</OutputPath>
19-
<DefineConstants>DEBUG</DefineConstants>
20-
<ErrorReport>prompt</ErrorReport>
21-
<WarningLevel>4</WarningLevel>
227
<NoWarn>1591;1573</NoWarn>
23-
<DocumentationFile>bin\Debug\Mono.Debugging.Soft.xml</DocumentationFile>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
8+
<DocumentationFile>bin\$(Configuration)\Mono.Debugging.Soft.xml</DocumentationFile>
9+
<DebugSymbols>True</DebugSymbols>
2610
<DebugType>embedded</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
<DebugSymbols>true</DebugSymbols>
32-
<NoWarn>1591;1573</NoWarn>
33-
<DocumentationFile>bin\Release\Mono.Debugging.Soft.xml</DocumentationFile>
3411
</PropertyGroup>
12+
13+
<Import Project="..\Mono.Debugging.settings" />
14+
3515
<ItemGroup>
36-
<ProjectReference Include="..\Mono.Debugging\Mono.Debugging.csproj">
37-
<Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project>
38-
<Name>Mono.Debugging</Name>
39-
<Private>False</Private>
40-
</ProjectReference>
41-
<ProjectReference Include="..\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj">
42-
<Project>{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}</Project>
43-
<Name>Mono.Debugger.Soft</Name>
44-
<Private>False</Private>
45-
</ProjectReference>
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="ArrayAdaptor.cs" />
49-
<Compile Include="FieldValueReference.cs" />
50-
<Compile Include="InstructionBreakpoint.cs" />
51-
<Compile Include="PropertyValueReference.cs" />
52-
<Compile Include="SoftDebuggerSession.cs" />
53-
<Compile Include="VariableValueReference.cs" />
54-
<Compile Include="SoftEvaluationContext.cs" />
55-
<Compile Include="SoftDebuggerAdaptor.cs" />
56-
<Compile Include="SoftDebuggerBacktrace.cs" />
57-
<Compile Include="SoftDebuggerStartInfo.cs" />
58-
<Compile Include="AssemblyInfo.cs" />
59-
<Compile Include="StringAdaptor.cs" />
60-
<Compile Include="SoftValueReference.cs" />
61-
<Compile Include="LocalVariableBatch.cs" />
62-
<Compile Include="ThisValueReference.cs" />
63-
<Compile Include="FieldReferenceBatch.cs" />
64-
<Compile Include="PortablePdbData.cs" />
65-
<Compile Include="SourceLinkMap.cs" />
66-
<Compile Include="JsonSourceLink.cs" />
67-
<Compile Include="Subprocess.cs" />
16+
<ProjectReference Include="..\Mono.Debugging\Mono.Debugging.csproj" />
17+
<ProjectReference Include="..\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj" />
6818
</ItemGroup>
19+
6920
<PropertyGroup>
7021
<NuGetVersionRoslyn Condition="$(NuGetVersionRoslyn) == ''">2.10.0</NuGetVersionRoslyn>
7122
<NuGetVersionCecil Condition="$(NuGetVersionCecil) == ''">0.10.1</NuGetVersionCecil>
7223
</PropertyGroup>
24+
7325
<ItemGroup>
7426
<PackageReference Include="Mono.Cecil" Version="$(NuGetVersionCecil)" PrivateAssets="all" />
7527
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" />
7628
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(NuGetVersionRoslyn)" PrivateAssets="all" />
77-
<PackageReference Include="Newtonsoft.Json">
78-
<Version>10.0.3</Version>
79-
</PackageReference>
29+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
8030
</ItemGroup>
31+
8132
<ItemGroup>
82-
<Reference Include="System" />
83-
<Reference Include="System.Core" />
8433
<Reference Condition=" '$(OS)' != 'Windows_NT' " Include="Mono.Posix" />
8534
<PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Mono.Posix-4.5" Version="4.5.0" />
8635
</ItemGroup>
87-
<Import Project="..\Mono.Debugging.settings" />
88-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
36+
8937
<ItemGroup>
9038
<None Include="Makefile.am" />
9139
</ItemGroup>
40+
9241
</Project>

0 commit comments

Comments
 (0)