Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.

Commit 6b16fe2

Browse files
zippy1981zippy1981
authored
lets just update EF and switch everything to nunit. (#41)
* lets just update EF and switch everything to nunit. * Well lets just try updating Visual Studio Images
1 parent c7d5c01 commit 6b16fe2

File tree

15 files changed

+94
-41
lines changed

15 files changed

+94
-41
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,13 @@ _TeamCity*
147147
*.coveragexml
148148

149149
# NCrunch
150+
*.ncrunch*
150151
_NCrunch_*
151-
.*crunch*.local.xml
152+
*.crunch.xml
153+
*.ncrunchsolution*
152154
nCrunchTemp_*
153155

156+
154157
# MightyMoose
155158
*.mm.*
156159
AutoTest.Net/

‎AlwaysEncryptedSample.Models.Tests/AlwaysEncryptedSample.Models.Tests.csproj

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
4-
<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
3+
<Import Project="..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" />
4+
<Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
5+
<Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" />
56
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
67
<PropertyGroup>
78
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,20 +36,23 @@
3536
<WarningLevel>4</WarningLevel>
3637
</PropertyGroup>
3738
<ItemGroup>
38-
<Reference Include="Effort, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6a46696d54971e6d, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Effort.EF6.2.1.0\lib\net45\Effort.dll</HintPath>
39+
<Reference Include="Effort, Version=2.2.4.0, Culture=neutral, PublicKeyToken=6a46696d54971e6d, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Effort.EF6.2.2.4\lib\net45\Effort.dll</HintPath>
4041
</Reference>
4142
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
42-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
43+
<HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
44+
<Private>True</Private>
4345
</Reference>
4446
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
45-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
47+
<HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
48+
<Private>True</Private>
4649
</Reference>
4750
<Reference Include="NMemory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
4851
<HintPath>..\packages\NMemory.3.1.0\lib\net45\NMemory.dll</HintPath>
4952
</Reference>
50-
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
51-
<HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
53+
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
54+
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
55+
<Private>True</Private>
5256
</Reference>
5357
<Reference Include="System" />
5458
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -77,9 +81,12 @@
7781
<PropertyGroup>
7882
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7983
</PropertyGroup>
80-
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
81-
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
84+
<Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.props'))" />
85+
<Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.targets'))" />
86+
<Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
87+
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
8288
</Target>
89+
<Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" />
8390
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8491
Other similar extension points exist, see Microsoft.Common.targets.
8592
<Target Name="BeforeBuild">

‎AlwaysEncryptedSample.Models.Tests/app.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
4+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6+
</configSections>
67
<entityFramework>
78
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
89
<parameters>

‎AlwaysEncryptedSample.Models.Tests/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Effort.EF6" version="2.1.0" targetFramework="net461" />
4-
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
3+
<package id="Effort.EF6" version="2.2.4" targetFramework="net461" />
4+
<package id="EntityFramework" version="6.3.0" targetFramework="net461" />
55
<package id="NMemory" version="3.1.0" targetFramework="net461" />
6-
<package id="NUnit" version="3.11.0" targetFramework="net461" />
7-
<package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net461" />
6+
<package id="NUnit" version="3.12.0" targetFramework="net461" />
7+
<package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net461" />
88
<package id="System.Data.SqlClient" version="4.7.0" targetFramework="net461" />
99
</packages>

‎AlwaysEncryptedSample.Models/AlwaysEncryptedSample.Models.csproj

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
1213
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1518
</PropertyGroup>
1619
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1720
<DebugSymbols>true</DebugSymbols>
@@ -32,10 +35,12 @@
3235
</PropertyGroup>
3336
<ItemGroup>
3437
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
35-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
38+
<HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
39+
<Private>True</Private>
3640
</Reference>
3741
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
38-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
42+
<HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
43+
<Private>True</Private>
3944
</Reference>
4045
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
4146
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -144,6 +149,14 @@
144149
</EmbeddedResource>
145150
</ItemGroup>
146151
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
152+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
153+
<PropertyGroup>
154+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
155+
</PropertyGroup>
156+
<Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.props'))" />
157+
<Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.targets'))" />
158+
</Target>
159+
<Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" />
147160
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
148161
Other similar extension points exist, see Microsoft.Common.targets.
149162
<Target Name="BeforeBuild">

‎AlwaysEncryptedSample.Models/app.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
4+
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
75
<section name="AlwaysEncryptedSample.Models.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
86
</sectionGroup>
7+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
8+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
99
</configSections>
1010
<runtime>
1111
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

‎AlwaysEncryptedSample.Models/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
3+
<package id="EntityFramework" version="6.3.0" targetFramework="net461" />
44
<package id="log4net" version="2.0.8" targetFramework="net461" />
55
<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
66
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net461" />

‎AlwaysEncryptedSample.Tests/AlwaysEncryptedSample.Tests.csproj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" />
4+
<Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
35
<PropertyGroup>
46
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
57
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,6 +17,8 @@
1517
<FileAlignment>512</FileAlignment>
1618
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1719
<TargetFrameworkProfile />
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
1822
</PropertyGroup>
1923
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2024
<DebugSymbols>true</DebugSymbols>
@@ -35,10 +39,12 @@
3539
</PropertyGroup>
3640
<ItemGroup>
3741
<Reference Include="Microsoft.CSharp" />
38-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
3942
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4043
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4144
</Reference>
45+
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
46+
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
47+
</Reference>
4248
<Reference Include="System" />
4349
<Reference Include="System.ComponentModel.DataAnnotations" />
4450
<Reference Include="System.Configuration" />
@@ -97,6 +103,13 @@
97103
</ProjectReference>
98104
</ItemGroup>
99105
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
106+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
107+
<PropertyGroup>
108+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
109+
</PropertyGroup>
110+
<Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
111+
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
112+
</Target>
100113
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101114
Other similar extension points exist, see Microsoft.Common.targets.
102115
<Target Name="BeforeBuild">

‎AlwaysEncryptedSample.Tests/Controllers/HomeControllerTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System.Web.Mvc;
2-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
using NUnit.Framework;
33

44
namespace AlwaysEncryptedSample.Controllers
55
{
6-
[TestClass]
6+
[TestFixture]
77
public class HomeControllerTest
88
{
9-
[TestMethod]
9+
[Test]
1010
public void Index()
1111
{
1212
// Arrange
@@ -19,7 +19,7 @@ public void Index()
1919
Assert.IsNotNull(result);
2020
}
2121

22-
[TestMethod]
22+
[Test]
2323
public void About()
2424
{
2525
// Arrange
@@ -32,7 +32,7 @@ public void About()
3232
Assert.AreEqual("Your application description page.", result.ViewBag.Message);
3333
}
3434

35-
[TestMethod]
35+
[Test]
3636
public void Contact()
3737
{
3838
// Arrange

‎AlwaysEncryptedSample.Tests/Controllers/InternalsControllerTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
using System.Web.Mvc;
2-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
2+
using System.Web.Mvc;
33

44
namespace AlwaysEncryptedSample.Controllers
55
{
6-
[TestClass]
6+
[TestFixture]
77
public class InternalsControllerTest
88
{
99
InternalsController controller = new InternalsController();
10-
[Ignore]
11-
[TestMethod]
10+
[Ignore("Because")]
11+
[Test]
1212
public void Index()
1313
{
1414
// Act

0 commit comments

Comments
 (0)