Skip to content

Commit 5c1dd05

Browse files
mwhelanmwhelan
authored
Merge pull request #80 from jafin/feat/NetCoreSupport
feat (NetCoreSupport): Continue work done on PR #78
2 parents 6a0a695 + 511586e commit 5c1dd05

File tree

121 files changed

+602
-81975
lines changed

Some content is hidden

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

121 files changed

+602
-81975
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ obj
66
TestResult*
77

88
# Misc
9+
.vscode
910
_ReSharper.*
11+
.idea
1012
*.user
1113
*.suo
1214
*.crunchproject.local.xml
@@ -17,3 +19,7 @@ _NCrunch*
1719
*.orig
1820
packages
1921
ConventionTests.sln.ide/
22+
/.vs/ConventionTests/DesignTimeBuild/.dtbcache.v2
23+
/.vs/ConventionTests/v16/TestStore/0/000.testlog
24+
/.vs/ConventionTests/v16/TestStore/0/testlog.manifest
25+
/artifacts/**

‎Backup/TestAssembly/TestAssembly(2).csproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net35;net40;net451;netstandard1.5;</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.5</TargetFrameworks>
5+
<AssemblyName>TestAssembly</AssemblyName>
6+
<PackageId>TestAssembly</PackageId>
7+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
8+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
13+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
14+
</PropertyGroup>
15+
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
17+
<Reference Include="System.Runtime" />
18+
<Reference Include="System.Threading.Tasks" />
19+
<Reference Include="System.Web" />
20+
<Reference Include="Microsoft.CSharp" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
24+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
25+
</ItemGroup>
26+
27+
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
29+
<DefineConstants>$(DefineConstants);netmvc</DefineConstants>
30+
</PropertyGroup>
31+
32+
</Project>

‎Backup/TestAssembly/TestAssembly(3).csproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net35;net40;net451;netstandard1.5;</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.5</TargetFrameworks>
5+
<AssemblyName>TestAssembly</AssemblyName>
6+
<PackageId>TestAssembly</PackageId>
7+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
8+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
13+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
14+
</PropertyGroup>
15+
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
17+
<Reference Include="System.Runtime" />
18+
<Reference Include="System.Threading.Tasks" />
19+
<Reference Include="System.Web" />
20+
<Reference Include="Microsoft.CSharp" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
24+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
25+
</ItemGroup>
26+
27+
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
29+
<DefineConstants>$(DefineConstants);netmvc</DefineConstants>
30+
</PropertyGroup>
31+
32+
</Project>

‎Backup/TestAssembly/TestAssembly.csproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net35;net40;net451;netstandard1.5;</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.5</TargetFrameworks>
5+
<AssemblyName>TestAssembly</AssemblyName>
6+
<PackageId>TestAssembly</PackageId>
7+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
8+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
13+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
14+
</PropertyGroup>
15+
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
17+
<Reference Include="System.Runtime" />
18+
<Reference Include="System.Threading.Tasks" />
19+
<Reference Include="System.Web" />
20+
<Reference Include="Microsoft.CSharp" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
24+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
25+
</ItemGroup>
26+
27+
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
29+
<DefineConstants>$(DefineConstants);netmvc</DefineConstants>
30+
</PropertyGroup>
31+
32+
</Project>

‎ConventionTests.sln

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.26228.12
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF9054EE-FE89-47A4-9156-BE54A837F2F7}"
76
ProjectSection(SolutionItems) = preProject
@@ -11,25 +10,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1110
README.md = README.md
1211
EndProjectSection
1312
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.ConventionTests", "TestStack.ConventionTests\TestStack.ConventionTests.csproj", "{955B0236-089F-434D-BA02-63A1E24C2B7C}"
15-
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.ConventionTests.Tests", "TestStack.ConventionTests.Tests\TestStack.ConventionTests.Tests.csproj", "{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}"
17-
EndProject
1813
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{35B8E1F6-8E97-40A6-91E3-CB765328424F}"
1914
ProjectSection(SolutionItems) = preProject
2015
.nuget\packages.config = .nuget\packages.config
2116
EndProjectSection
2217
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly", "TestAssembly\TestAssembly.csproj", "{D5A0D078-C660-4654-8A14-DDC816BEBC54}"
24-
EndProject
2518
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E971721A-1271-4359-8F76-9FF17C29582B}"
2619
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.ConventionTests.Autofac", "TestStack.ConventionTests.Autofac\TestStack.ConventionTests.Autofac.csproj", "{A747FD64-5338-4572-879D-A9DEB00EBD56}"
28-
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "Samples\SampleApp\SampleApp.csproj", "{56467A5A-7DD6-45B3-A84C-144A3C5D0C7A}"
30-
EndProject
31-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp.Tests", "Samples\SampleApp.Tests\SampleApp.Tests.csproj", "{8FEF48A8-6FF5-4B65-B84A-6690D735C703}"
32-
EndProject
3320
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{D822A12B-D358-48BC-8158-EB5CC253C858}"
3421
ProjectSection(SolutionItems) = preProject
3522
docs\changelog.md = docs\changelog.md
@@ -39,6 +26,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{D822A12B-D
3926
Docs\symmetric-conventions.md = Docs\symmetric-conventions.md
4027
EndProjectSection
4128
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.ConventionTests", "TestStack.ConventionTests\TestStack.ConventionTests.csproj", "{955B0236-089F-434D-BA02-63A1E24C2B7C}"
30+
EndProject
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStack.ConventionTests.Tests", "TestStack.ConventionTests.Tests\TestStack.ConventionTests.Tests.csproj", "{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}"
32+
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly", "TestAssembly\TestAssembly.csproj", "{D5A0D078-C660-4654-8A14-DDC816BEBC54}"
34+
EndProject
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStack.ConventionTests.Autofac", "TestStack.ConventionTests.Autofac\TestStack.ConventionTests.Autofac.csproj", "{A747FD64-5338-4572-879D-A9DEB00EBD56}"
36+
EndProject
37+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "Samples\SampleApp\SampleApp.csproj", "{56467A5A-7DD6-45B3-A84C-144A3C5D0C7A}"
38+
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp.Tests", "Samples\SampleApp.Tests\SampleApp.Tests.csproj", "{8FEF48A8-6FF5-4B65-B84A-6690D735C703}"
40+
EndProject
4241
Global
4342
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4443
Debug|Any CPU = Debug|Any CPU

‎ConventionTests.sln.DotSettings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MQ/@EntryIndexedValue">MQ</s:String>
1111
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
1212
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
13+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
14+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
15+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
1316
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
1417
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
1518
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎ConventionTests.v2.ncrunchsolution

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

‎Samples/SampleApp.Tests/ProjectConfigurationTests.cs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace SampleApp.Tests
22
{
3-
using System;
43
using System.IO;
4+
using System.Reflection;
55
using NUnit.Framework;
66
using TestStack.ConventionTests;
77
using TestStack.ConventionTests.ConventionData;
@@ -10,41 +10,46 @@
1010
[TestFixture]
1111
public class ProjectConfigurationTests
1212
{
13-
string projectLocation;
13+
readonly string projectLocation;
1414

1515
public ProjectConfigurationTests()
1616
{
17-
projectLocation = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, @"..\..\..\SampleApp\SampleApp.csproj"));
17+
projectLocation = Path.GetFullPath(Path.Combine(Assembly.GetExecutingAssembly().Location,
18+
@"..\..\..\..\SampleApp\SampleApp.csproj"));
1819
}
1920

2021
[Test]
2122
public void debug_configurations_should_have_debug_type_pdb_only()
2223
{
23-
var configurationHasSpecificValue = new ConfigurationHasSpecificValue(ConfigurationType.Debug, "DebugType", "full");
24+
var configurationHasSpecificValue =
25+
new ConfigurationHasSpecificValue(ConfigurationType.Debug, "DebugType", "full");
2426
var projectPropertyGroups = new ProjectPropertyGroups(projectLocation);
2527
Convention.Is(configurationHasSpecificValue, projectPropertyGroups);
2628
}
2729

2830
[Test]
2931
public void debug_configurations_should_have_optimize_false()
3032
{
31-
var configurationHasSpecificValue = new ConfigurationHasSpecificValue(ConfigurationType.Debug, "Optimize", "false");
33+
var configurationHasSpecificValue =
34+
new ConfigurationHasSpecificValue(ConfigurationType.Debug, "Optimize", "false");
3235
var projectPropertyGroups = new ProjectPropertyGroups(projectLocation);
3336
Convention.Is(configurationHasSpecificValue, projectPropertyGroups);
3437
}
3538

3639
[Test]
3740
public void release_configurations_should_have_debug_type_pdb_only()
3841
{
39-
var configurationHasSpecificValue = new ConfigurationHasSpecificValue(ConfigurationType.Release, "DebugType", "pdbonly");
42+
var configurationHasSpecificValue =
43+
new ConfigurationHasSpecificValue(ConfigurationType.Release, "DebugType", "pdbonly");
4044
var projectPropertyGroups = new ProjectPropertyGroups(projectLocation);
4145
Convention.Is(configurationHasSpecificValue, projectPropertyGroups);
4246
}
4347

4448
[Test]
4549
public void release_configurations_should_have_optimize_true()
4650
{
47-
var configurationHasSpecificValue = new ConfigurationHasSpecificValue(ConfigurationType.Release, "Optimize", "true");
51+
var configurationHasSpecificValue =
52+
new ConfigurationHasSpecificValue(ConfigurationType.Release, "Optimize", "true");
4853
var projectPropertyGroups = new ProjectPropertyGroups(projectLocation);
4954
Convention.Is(configurationHasSpecificValue, projectPropertyGroups);
5055
}

0 commit comments

Comments
 (0)