Skip to content

Commit d34430a

Browse files
rolfbjarnerolfbjarne
authored
Switch to short-form projects and build for both net461 and netstandard2.0. (#68)
* Use package references instead of packages.conf in preparation for move to short-form csprojs. * Move to short-form csproj. * Build for netstandard2.0.
1 parent 0f578f5 commit d34430a

File tree

2 files changed

+13
-110
lines changed

2 files changed

+13
-110
lines changed

‎UnitTests/UnitTests.csproj‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{39DBAAF8-57A5-49A3-9E9A-11B545906AED}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<RootNamespace>UnitTests</RootNamespace>
9-
<AssemblyName>UnitTests</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11-
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
13-
<DebugSymbols>true</DebugSymbols>
14-
<DebugType>full</DebugType>
15-
<Optimize>false</Optimize>
16-
<OutputPath>bin\Debug</OutputPath>
17-
<DefineConstants>DEBUG;</DefineConstants>
18-
<ErrorReport>prompt</ErrorReport>
19-
<WarningLevel>4</WarningLevel>
20-
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
22-
<Optimize>true</Optimize>
23-
<OutputPath>bin\Release</OutputPath>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
4+
<TargetFramework>net461</TargetFramework>
265
</PropertyGroup>
276
<ItemGroup>
28-
<Reference Include="System" />
297
<PackageReference Include="NUnit" Version="3.12.0" />
308
<PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
319
</ItemGroup>
32-
<ItemGroup>
33-
<Compile Include="TestMobileProvisionIndex.cs" />
34-
</ItemGroup>
3510
<ItemGroup>
3611
<None Include="TestData\Provisioning Profiles\29cbf4b4-a170-4c74-a29a-64ecd55b102e.mobileprovision" />
3712
<None Include="TestData\Provisioning Profiles\7079f389-6ff4-4290-bf76-c8a222947616.mobileprovision" />
3813
</ItemGroup>
3914
<ItemGroup>
40-
<Folder Include="TestData\" />
41-
<Folder Include="TestData\Provisioning Profiles\" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<ProjectReference Include="..\Xamarin.MacDev\Xamarin.MacDev.csproj">
45-
<Project>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</Project>
46-
<Name>Xamarin.MacDev</Name>
47-
</ProjectReference>
15+
<ProjectReference Include="..\Xamarin.MacDev\Xamarin.MacDev.csproj" />
4816
</ItemGroup>
49-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
50-
</Project>
17+
</Project>

‎Xamarin.MacDev/Xamarin.MacDev.csproj‎

Lines changed: 9 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')"/>
2+
<Project Sdk="Microsoft.NET.Sdk">
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<RootNamespace>Xamarin.MacDev</RootNamespace>
10-
<AssemblyName>Xamarin.MacDev</AssemblyName>
11-
<ProductVersion>8.0.30703</ProductVersion>
12-
<SchemaVersion>2.0</SchemaVersion>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug</OutputPath>
20-
<DefineConstants>DEBUG;</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<ConsolePause>false</ConsolePause>
24-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>full</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release</OutputPath>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
<ConsolePause>false</ConsolePause>
4+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
335
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
347
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
10+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
11+
<PrivateAssets>all</PrivateAssets>
12+
</PackageReference>
13+
</ItemGroup>
3514
<ItemGroup>
3615
<FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
3716
<Authenticode>Microsoft400</Authenticode>
3817
</FilesToSign>
3918
</ItemGroup>
40-
<ItemGroup>
41-
<Reference Include="System" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Xml" />
44-
<Reference Include="Mono.Posix" />
45-
<Reference Include="System.Xml.Linq" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
<Compile Include="AnalyticsService.cs" />
50-
<Compile Include="AppleCodeSigningIdentity.cs" />
51-
<Compile Include="AppleIPhoneSdk.cs" />
52-
<Compile Include="AppleSdk.cs" />
53-
<Compile Include="AppleSdkSettings.cs" />
54-
<Compile Include="AppleTVOSSdk.cs" />
55-
<Compile Include="AppleWatchSdk.cs" />
56-
<Compile Include="EntitlementExtensions.cs" />
57-
<Compile Include="ExtendedVersion.cs" />
58-
<Compile Include="HttpMessageHandler.cs" />
59-
<Compile Include="IMonoMacSdk.cs" />
60-
<Compile Include="IPhoneArchitecture.cs" />
61-
<Compile Include="IPhoneCertificate.cs" />
62-
<Compile Include="IPhoneDeviceCapabilities.cs" />
63-
<Compile Include="IPhoneDeviceType.cs" />
64-
<Compile Include="IPhoneImageSizes.cs" />
65-
<Compile Include="IPhoneSdkVersion.cs" />
66-
<Compile Include="Keychain.cs" />
67-
<Compile Include="LoggingService.cs" />
68-
<Compile Include="MacOSXSdk.cs" />
69-
<Compile Include="MacOSXSdkVersion.cs" />
70-
<Compile Include="ManifestExtensions.cs" />
71-
<Compile Include="MobileProvision.cs" />
72-
<Compile Include="MobileProvisionIndex.cs" />
73-
<Compile Include="MonoMacSdk.cs" />
74-
<Compile Include="MonoTouchSdk.cs" />
75-
<Compile Include="PlatformAvailability.cs" />
76-
<Compile Include="PListObject.cs" />
77-
<Compile Include="ProcessArgumentBuilder.cs" />
78-
<Compile Include="SQLite.cs" />
79-
<Compile Include="XamMacSdk.cs" />
80-
</ItemGroup>
81-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
82-
<Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')"/>
8319
</Project>

0 commit comments

Comments
 (0)