Skip to content

Commit 3ab6585

Browse files
KnagisKnagis
authored
Merge pull request #122 from sharwell/use-cps
Update to the new project system
2 parents f3d5453 + cfa9715 commit 3ab6585

21 files changed

+153
-446
lines changed

‎CommonMark.Console/CommonMark.Console.csproj

Lines changed: 30 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,42 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="MSBuild.Sdk.Extras">
3+
44
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{83F44787-27A2-4C18-97E2-497437C8EF75}</ProjectGuid>
5+
<TargetFrameworks>net45</TargetFrameworks>
86
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CommonMark.Console</RootNamespace>
11-
<AssemblyName>CommonMark.Console</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile>
15-
</TargetFrameworkProfile>
167
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
8+
9+
<PropertyGroup>
10+
<AssemblyTitle>CommonMark.NET Console</AssemblyTitle>
11+
<Company>CommonMark.NET</Company>
12+
<Product>CommonMark.NET</Product>
13+
<Description>https://github.com/Knagis/CommonMark.NET</Description>
14+
<Copyright>Copyright © Kārlis Gaņģis 2014</Copyright>
15+
16+
<Version>1.0.0.0</Version>
17+
<FileVersion>1.0.0.0</FileVersion>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<AssemblyAttribute Include="System.Reflection.AssemblyCultureAttribute">
22+
<_Parameter1></_Parameter1>
23+
</AssemblyAttribute>
24+
<AssemblyAttribute Include="System.Reflection.AssemblyTrademarkAttribute">
25+
<_Parameter1></_Parameter1>
26+
</AssemblyAttribute>
27+
</ItemGroup>
28+
29+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
1930
<DebugSymbols>true</DebugSymbols>
2031
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
2732
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
33+
34+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3035
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<Prefer32Bit>false</Prefer32Bit>
3736
</PropertyGroup>
37+
3838
<ItemGroup>
39-
<Reference Include="System" />
40-
<Reference Include="System.Core" />
41-
</ItemGroup>
42-
<ItemGroup>
43-
<Compile Include="Program.cs" />
44-
<Compile Include="Properties\AssemblyInfo.cs" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<None Include="App.nuget.config" />
48-
<None Include="Sample.txt" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<None Include="App.config" />
52-
</ItemGroup>
53-
<ItemGroup>
54-
<ProjectReference Include="..\CommonMark\CommonMark.NET45.csproj">
55-
<Project>{40ab0d9c-9464-45b2-ac79-72a566fa1371}</Project>
56-
<Name>CommonMark.NET45</Name>
57-
</ProjectReference>
39+
<ProjectReference Include="..\CommonMark\CommonMark.Base.csproj" />
5840
</ItemGroup>
59-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
60-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61-
Other similar extension points exist, see Microsoft.Common.targets.
62-
<Target Name="BeforeBuild">
63-
</Target>
64-
<Target Name="AfterBuild">
65-
</Target>
66-
-->
41+
6742
</Project>

‎CommonMark.Console/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,6 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
4-
5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyTitle("CommonMark.NET Console")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("CommonMark.NET")]
13-
[assembly: AssemblyCopyright("Copyright © Kārlis Gaņģis 2014")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
1+
using System.Runtime.InteropServices;
162

173
// Setting ComVisible to false makes the types in this assembly not visible
184
// to COM components. If you need to access a type in this assembly from
195
// COM, set the ComVisible attribute to true on that type.
206
[assembly: ComVisible(false)]
21-
22-
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("c23df822-e0ff-4545-af75-6db40fa843ce")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎CommonMark.NET.nuspec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
</metadata>
1818
<files>
1919
<file src="LICENSE.md" target="\" />
20-
<file src="CommonMark\bin\v2.0\Release\CommonMark.*" target="lib\net20\" />
21-
<file src="CommonMark\bin\v3.5\Release\CommonMark.*" target="lib\net35-client\" />
22-
<file src="CommonMark\bin\v4.0\Release\CommonMark.*" target="lib\net40-client\" />
23-
<file src="CommonMark\bin\v4.5\Release\CommonMark.*" target="lib\net45\" />
24-
<file src="CommonMark\bin\portable\Release\CommonMark.*" target="lib\portable-net40+sl50+wp80+win+wpa81+MonoAndroid10+MonoTouch10\" />
25-
<file src="CommonMark\bin\portable_259\Release\CommonMark.*" target="lib\portable-net45+wp80+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\" />
26-
<file src="CommonMark\bin\portable_259\Release\CommonMark.*" target="lib\netstandard1.0\" />
27-
<file src="CommonMark.Console\bin\Release\CommonMark.Console.exe" target="tools\cmark.exe" />
20+
<file src="CommonMark\bin\$configuration$\net20\CommonMark.*" target="lib\net20\" />
21+
<file src="CommonMark\bin\$configuration$\net35-client\CommonMark.*" target="lib\net35-client\" />
22+
<file src="CommonMark\bin\$configuration$\net40-client\CommonMark.*" target="lib\net40-client\" />
23+
<file src="CommonMark\bin\$configuration$\net45\CommonMark.*" target="lib\net45\" />
24+
<file src="CommonMark\bin\$configuration$\portable-net4+sl5+win+wpa+wp8\CommonMark.*" target="lib\portable-net40+sl50+wp80+win+wpa81+MonoAndroid10+MonoTouch10\" />
25+
<file src="CommonMark\bin\$configuration$\portable-net45+win+wpa+wp8\CommonMark.*" target="lib\portable-net45+wp80+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\" />
26+
<file src="CommonMark\bin\$configuration$\netstandard1.0\CommonMark.*" target="lib\netstandard1.0\" />
27+
<file src="CommonMark.Console\bin\$configuration$\net45\CommonMark.Console.exe" target="tools\cmark.exe" />
2828
<file src="CommonMark.Console\App.nuget.config" target="tools\cmark.exe.config" />
2929
</files>
3030
</package>

‎CommonMark.Tests/CommonMark.Tests.csproj

Lines changed: 34 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,56 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project Sdk="MSBuild.Sdk.Extras">
3+
34
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{B3158916-F54D-4F00-B553-E86D4370FF96}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>CommonMark.Tests</RootNamespace>
10-
<AssemblyName>CommonMark.Tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
15-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
16-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
17-
<IsCodedUITest>False</IsCodedUITest>
18-
<TestProjectType>UnitTest</TestProjectType>
5+
<TargetFrameworks>net451</TargetFrameworks>
196
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
7+
8+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
219
<DebugSymbols>true</DebugSymbols>
2210
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
2811
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
12+
13+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3014
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
3615
</PropertyGroup>
16+
3717
<PropertyGroup>
38-
<SignAssembly>true</SignAssembly>
18+
<Description>https://github.com/Knagis/CommonMark.NET</Description>
19+
<Copyright>Copyright © Kārlis Gaņģis 2014</Copyright>
20+
21+
<Version>1.0.0.0</Version>
22+
<FileVersion>1.0.0.0</FileVersion>
3923
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<AssemblyAttribute Include="System.Reflection.AssemblyCultureAttribute">
27+
<_Parameter1></_Parameter1>
28+
</AssemblyAttribute>
29+
<AssemblyAttribute Include="System.Reflection.AssemblyTrademarkAttribute">
30+
<_Parameter1></_Parameter1>
31+
</AssemblyAttribute>
32+
</ItemGroup>
33+
4034
<PropertyGroup>
35+
<SignAssembly>true</SignAssembly>
4136
<AssemblyOriginatorKeyFile>..\CommonMark\Properties\public.snk</AssemblyOriginatorKeyFile>
4237
</PropertyGroup>
38+
4339
<ItemGroup>
44-
<Reference Include="System" />
45-
</ItemGroup>
46-
<Choose>
47-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
48-
<ItemGroup>
49-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
50-
</ItemGroup>
51-
</When>
52-
<Otherwise>
53-
<ItemGroup>
54-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
55-
</ItemGroup>
56-
</Otherwise>
57-
</Choose>
58-
<ItemGroup>
59-
<Compile Include="DelimiterCharTests.cs" />
60-
<Compile Include="HeadingTests.cs" />
61-
<Compile Include="PlaceholderTests.cs" />
62-
<Compile Include="SourcePositionTests.cs" />
63-
<Compile Include="EnumeratorTests.cs" />
64-
<Compile Include="StrikethroughTests.cs" />
65-
<Compile Include="ListTests.cs" />
66-
<Compile Include="HtmlTests.cs" />
67-
<Compile Include="SettingsTests.cs" />
68-
<Compile Include="GeneralTests.cs" />
69-
<Compile Include="UrlTests.cs" />
70-
<Compile Include="EmphasisTests.cs" />
71-
<Compile Include="Helpers.cs" />
72-
<Compile Include="Properties\AssemblyInfo.cs" />
73-
<Compile Include="Specification\Specs.cs">
74-
<AutoGen>True</AutoGen>
75-
<DesignTime>True</DesignTime>
76-
<DependentUpon>Specs.tt</DependentUpon>
77-
</Compile>
40+
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
41+
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" PrivateAssets="all" />
7842
</ItemGroup>
43+
7944
<ItemGroup>
80-
<None Include="Specification\Specs.tt">
81-
<Generator>TextTemplatingFileGenerator</Generator>
82-
<LastGenOutput>Specs.cs</LastGenOutput>
83-
</None>
45+
<ProjectReference Include="..\CommonMark\CommonMark.Base.csproj" />
8446
</ItemGroup>
47+
8548
<ItemGroup>
86-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
49+
<Compile Update="Specification\Specs.cs" DependentUpon="Specs.tt" />
8750
</ItemGroup>
51+
8852
<ItemGroup>
89-
<ProjectReference Include="..\CommonMark\CommonMark.Base.csproj">
90-
<Project>{0fd4b1dd-45a8-4f02-beb0-5881cd512573}</Project>
91-
<Name>CommonMark.Base</Name>
92-
</ProjectReference>
53+
<None Update="Specification\Specs.tt" Generator="TextTemplatingFileGenerator" />
9354
</ItemGroup>
94-
<Choose>
95-
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
96-
<ItemGroup>
97-
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<Private>False</Private>
99-
</Reference>
100-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101-
<Private>False</Private>
102-
</Reference>
103-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104-
<Private>False</Private>
105-
</Reference>
106-
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
107-
<Private>False</Private>
108-
</Reference>
109-
</ItemGroup>
110-
</When>
111-
</Choose>
112-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
113-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
114-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
115-
Other similar extension points exist, see Microsoft.Common.targets.
116-
<Target Name="BeforeBuild">
117-
</Target>
118-
<Target Name="AfterBuild">
119-
</Target>
120-
-->
55+
12156
</Project>

‎CommonMark.Tests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,6 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
4-
5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyTitle("CommonMark.Tests")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("CommonMark.Tests")]
13-
[assembly: AssemblyCopyright("Copyright © Kārlis Gaņģis 2014")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
1+
using System.Runtime.InteropServices;
162

173
// Setting ComVisible to false makes the types in this assembly not visible
184
// to COM components. If you need to access a type in this assembly from
195
// COM, set the ComVisible attribute to true on that type.
206
[assembly: ComVisible(false)]
21-
22-
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("63cd64df-e46c-439d-942a-e0c461ff06c6")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)