Skip to content

Commit 8eb7853

Browse files
psoholtpsoholt
authored
Merge pull request #60 from chrisevans9629/master
Upgraded to Sdk style projects
2 parents 4dfdd84 + c984399 commit 8eb7853

File tree

8 files changed

+39
-240
lines changed

8 files changed

+39
-240
lines changed

‎VerbalExpressions.sln

+18-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerbalExpressions", "VerbalExpressions\VerbalExpressions.csproj", "{A3EF47F0-704F-4155-BAC7-DD919B957CC0}"
5-
EndProject
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29613.14
5+
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VerbalExpressionsUnitTests", "VerbalExpressionsUnitTests\VerbalExpressionsUnitTests.csproj", "{DA5044A2-4E99-454F-A627-6DC3B861EC44}"
77
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VerbalExpressions", "VerbalExpressions\VerbalExpressions.csproj", "{30D94325-EED5-4C4A-A319-6353B0FBBD41}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA60385A-B769-4F31-BAD2-A2DC3DCC625D}"
11+
ProjectSection(SolutionItems) = preProject
12+
README.md = README.md
13+
VerbalExpressions.nuspec = VerbalExpressions.nuspec
14+
EndProjectSection
15+
EndProject
816
Global
917
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1018
Debug|Any CPU = Debug|Any CPU
1119
Release|Any CPU = Release|Any CPU
1220
EndGlobalSection
1321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{A3EF47F0-704F-4155-BAC7-DD919B957CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{A3EF47F0-704F-4155-BAC7-DD919B957CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{A3EF47F0-704F-4155-BAC7-DD919B957CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{A3EF47F0-704F-4155-BAC7-DD919B957CC0}.Release|Any CPU.Build.0 = Release|Any CPU
1822
{DA5044A2-4E99-454F-A627-6DC3B861EC44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1923
{DA5044A2-4E99-454F-A627-6DC3B861EC44}.Debug|Any CPU.Build.0 = Debug|Any CPU
2024
{DA5044A2-4E99-454F-A627-6DC3B861EC44}.Release|Any CPU.ActiveCfg = Release|Any CPU
2125
{DA5044A2-4E99-454F-A627-6DC3B861EC44}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{30D94325-EED5-4C4A-A319-6353B0FBBD41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{30D94325-EED5-4C4A-A319-6353B0FBBD41}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{30D94325-EED5-4C4A-A319-6353B0FBBD41}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{30D94325-EED5-4C4A-A319-6353B0FBBD41}.Release|Any CPU.Build.0 = Release|Any CPU
2230
EndGlobalSection
2331
GlobalSection(SolutionProperties) = preSolution
2432
HideSolutionNode = FALSE
2533
EndGlobalSection
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {EE555874-8C6F-4102-AF81-074FE8C080E0}
36+
EndGlobalSection
2637
EndGlobal

‎VerbalExpressions/Properties/AssemblyInfo.cs

-28
This file was deleted.

‎VerbalExpressions/VerbalExpressions.csproj

+5-83
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.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')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{A3EF47F0-704F-4155-BAC7-DD919B957CC0}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>VerbalExpressions</RootNamespace>
12-
<AssemblyName>VerbalExpressions</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Profile136</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
16-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<FileUpgradeFlags>
18-
</FileUpgradeFlags>
19-
<UpgradeBackupLocation>
20-
</UpgradeBackupLocation>
21-
<OldToolsVersion>4.0</OldToolsVersion>
22-
<PublishUrl>publish\</PublishUrl>
23-
<Install>true</Install>
24-
<InstallFrom>Disk</InstallFrom>
25-
<UpdateEnabled>false</UpdateEnabled>
26-
<UpdateMode>Foreground</UpdateMode>
27-
<UpdateInterval>7</UpdateInterval>
28-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
29-
<UpdatePeriodically>false</UpdatePeriodically>
30-
<UpdateRequired>false</UpdateRequired>
31-
<MapFileExtensions>true</MapFileExtensions>
32-
<ApplicationRevision>0</ApplicationRevision>
33-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
34-
<IsWebBootstrapper>false</IsWebBootstrapper>
35-
<UseApplicationTrust>false</UseApplicationTrust>
36-
<BootstrapperEnabled>true</BootstrapperEnabled>
4+
<TargetFramework>netstandard1.0</TargetFramework>
375
</PropertyGroup>
38-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
39-
<DebugSymbols>true</DebugSymbols>
40-
<DebugType>full</DebugType>
41-
<Optimize>false</Optimize>
42-
<OutputPath>bin\Debug\</OutputPath>
43-
<DefineConstants>DEBUG;TRACE</DefineConstants>
44-
<ErrorReport>prompt</ErrorReport>
45-
<WarningLevel>4</WarningLevel>
46-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
47-
<RunCodeAnalysis>true</RunCodeAnalysis>
48-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
49-
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
51-
<DebugType>pdbonly</DebugType>
52-
<Optimize>true</Optimize>
53-
<OutputPath>bin\Release\</OutputPath>
54-
<DefineConstants>TRACE</DefineConstants>
55-
<ErrorReport>prompt</ErrorReport>
56-
<WarningLevel>4</WarningLevel>
57-
</PropertyGroup>
58-
<ItemGroup>
59-
<!-- A reference to the entire .NET Framework is automatically included -->
60-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
61-
<Visible>False</Visible>
62-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
63-
<Install>false</Install>
64-
</BootstrapperPackage>
65-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
66-
<Visible>False</Visible>
67-
<ProductName>.NET Framework 3.5 SP1</ProductName>
68-
<Install>false</Install>
69-
</BootstrapperPackage>
70-
</ItemGroup>
71-
<ItemGroup>
72-
<Compile Include="CommonRegex.cs" />
73-
<Compile Include="RegexCache.cs" />
74-
<Compile Include="VerbalExpressions.cs" />
75-
<Compile Include="Properties\AssemblyInfo.cs" />
76-
</ItemGroup>
77-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
78-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
79-
Other similar extension points exist, see Microsoft.Common.targets.
80-
<Target Name="BeforeBuild">
81-
</Target>
82-
<Target Name="AfterBuild">
83-
</Target>
84-
-->
85-
</Project>
6+
7+
</Project>

‎VerbalExpressions/VerbalExpressions.nuspec

-18
This file was deleted.

‎VerbalExpressionsUnitTests/AddTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace VerbalExpressionsUnitTests
77
[TestFixture]
88
public class AddTests
99
{
10+
//hello world
1011
[Test]
1112
public void Add_WhenNullStringPassedAsParameter_ShouldThrowNullArgumentException()
1213
{

‎VerbalExpressionsUnitTests/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎VerbalExpressionsUnitTests/VerbalExpressionsUnitTests.csproj

+15-64
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.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')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{DA5044A2-4E99-454F-A627-6DC3B861EC44}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>VerbalExpressionsUnitTests</RootNamespace>
11-
<AssemblyName>VerbalExpressionsUnitTests</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
4+
<TargetFramework>net45</TargetFramework>
175
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<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-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="nunit.framework">
39-
<HintPath>..\packages\NUnit.3.0.1\lib\net40\nunit.framework.dll</HintPath>
40-
</Reference>
41-
</ItemGroup>
6+
427
<ItemGroup>
43-
<Compile Include="AddModifierTests.cs" />
44-
<Compile Include="AddTests.cs" />
45-
<Compile Include="CaptureTests.cs" />
46-
<Compile Include="PerformanceTests.cs" />
47-
<Compile Include="RepeatPreviousTest.cs" />
48-
<Compile Include="EndOfLineTests.cs" />
49-
<Compile Include="MaybeTests.cs" />
50-
<Compile Include="MultipleTests.cs" />
51-
<Compile Include="OrTests.cs" />
52-
<Compile Include="RangeTests.cs" />
53-
<Compile Include="RemoveModifierTests.cs" />
54-
<Compile Include="SanatizeTests.cs" />
55-
<Compile Include="SomethingButTests.cs" />
56-
<Compile Include="SomethingTests.cs" />
57-
<Compile Include="StartOfLineTests.cs" />
58-
<Compile Include="ThenTests.cs" />
59-
<Compile Include="VerbalExpressionsTests.cs" />
60-
<Compile Include="Properties\AssemblyInfo.cs" />
61-
<Compile Include="WithAnyCaseTests.cs" />
8+
<ProjectReference Include="..\VerbalExpressions\VerbalExpressions.csproj" />
629
</ItemGroup>
10+
6311
<ItemGroup>
64-
<ProjectReference Include="..\VerbalExpressions\VerbalExpressions.csproj">
65-
<Project>{A3EF47F0-704F-4155-BAC7-DD919B957CC0}</Project>
66-
<Name>VerbalExpressions</Name>
67-
</ProjectReference>
12+
<Folder Include="Properties\" />
6813
</ItemGroup>
14+
6915
<ItemGroup>
70-
<None Include="packages.config" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
17+
<PackageReference Include="NUnit" Version="3.12.0" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
7122
</ItemGroup>
72-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
23+
7324
</Project>

‎VerbalExpressionsUnitTests/packages.config

-4
This file was deleted.

0 commit comments

Comments
 (0)