Skip to content

Commit 7f74efd

Browse files
mikeblakeukrobertcoltheart
authored andcommitted
Add net 4.5.2 and upgrade MSpec to v1 (#92)
* Add net 4.5.2 and upgrade MSpec to v1 * Updates based on PR. Removed net46
1 parent dd06d65 commit 7f74efd

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Machine.Fakes.Moq" Version="2.10.0" />
10-
<PackageReference Include="Machine.Specifications" Version="0.12.0" />
11-
<PackageReference Include="Machine.Specifications.Should" Version="0.11.0" />
10+
<PackageReference Include="Machine.Specifications" Version="1.0.0" />
11+
<PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1313
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.9.0" Condition="'$(TargetFramework)'=='netcoreapp2.1'" />
14-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" Condition="'$(TargetFramework)'=='net46'" />
14+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" Condition="'$(TargetFramework)'=='net452'" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>0.1.0</Version>
5-
<TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
66
<PackageId>Machine.Specifications.Runner.VisualStudio</PackageId>
77
<AssemblyName>Machine.TestAdapter</AssemblyName>
88
<Description>Machine.Specifications (MSpec) adapter for .NET Framework and .NET Core including dotnet cli (dotnet test), Visual Studio IDE, TFS, Visual Studio Online, Visual Studio Team Services.</Description>
@@ -28,9 +28,8 @@
2828
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
2929
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,17.0.0)" PrivateAssets="All" />
3030
</ItemGroup>
31-
32-
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
33-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0.0,17.0.0)" PrivateAssets="All" />
31+
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
32+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0,12.0]" PrivateAssets="All" />
3433
</ItemGroup>
3534

3635
<PropertyGroup>
@@ -44,7 +43,7 @@
4443
</ItemGroup>
4544
</Target>
4645

47-
<Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)' == 'net46'">
46+
<Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)'=='net452'">
4847
<ItemGroup>
4948
<TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
5049
<TfmSpecificPackageFile Include="$(OutputPath)\Machine.Specifications.dll" PackagePath="build\$(TargetFramework)\" />

src/SampleSpecs/SampleSpecs.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Machine.Specifications" Version="0.12.0" />
9-
<PackageReference Include="Machine.Specifications.Should" Version="0.11.0" />
8+
<PackageReference Include="Machine.Specifications" Version="1.0.0" />
9+
<PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
1010
</ItemGroup>
1111
</Project>

0 commit comments

Comments
 (0)