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

Commit 72369b4

Browse files
zippy1981zippy1981
committed
Merge branch 'dockerfying'
2 parents 47b2834 + 752c7f6 commit 72369b4

Some content is hidden

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

45 files changed

+1493
-231
lines changed

‎.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
# User-specific stuff:
2+
.idea/**/workspace.xml
3+
.idea/**/tasks.xml
4+
.idea/dictionaries
5+
16
## Ignore Visual Studio temporary files, build results, and
27
## files generated by popular Visual Studio add-ons.
38

49
# User-specific files
510
*.suo
611
*.user
712
*.sln.docstates
13+
.vs/
814

915
# Build results
1016
[Dd]ebug/
@@ -186,4 +192,7 @@ FakesAssemblies/
186192
# LightSwitch generated files
187193
GeneratedArtifacts/
188194
_Pvt_Extensions/
189-
ModelManifest.xml
195+
ModelManifest.xml
196+
197+
#Docker stuff
198+
volumes/

‎.idea/.idea.AlwaysEncryptedSample/.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.AlwaysEncryptedSample/.idea/contentModel.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.AlwaysEncryptedSample/.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.AlwaysEncryptedSample/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.AlwaysEncryptedSample/riderModule.iml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/config/applicationhost.config

Lines changed: 960 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AlwaysEncryptedSample/Models/AccountViewModels.cs renamed to ‎AlwaysEncryptedSample.Models/AccountViewModels.cs

File renamed without changes.

‎AlwaysEncryptedSample.Models/AlwaysEncryptedSample.Models.csproj

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.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')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{6F9599EB-3C9A-45AD-A081-30F83946D63C}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>AlwaysEncryptedSample.Models</RootNamespace>
11+
<AssemblyName>AlwaysEncryptedSample.Models</AssemblyName>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<DebugType>pdbonly</DebugType>
27+
<Optimize>true</Optimize>
28+
<OutputPath>bin\Release\</OutputPath>
29+
<DefineConstants>TRACE</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="EntityFramework">
35+
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
36+
</Reference>
37+
<Reference Include="EntityFramework.SqlServer">
38+
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
39+
</Reference>
40+
<Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
41+
<HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
44+
<Reference Include="Microsoft.AspNet.Identity.Core">
45+
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
46+
</Reference>
47+
<Reference Include="Microsoft.AspNet.Identity.EntityFramework">
48+
<HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
49+
</Reference>
50+
<Reference Include="Microsoft.AspNet.Identity.Owin">
51+
<HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
52+
</Reference>
53+
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
55+
<Private>True</Private>
56+
</Reference>
57+
<Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
59+
<Private>True</Private>
60+
</Reference>
61+
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
63+
<Private>True</Private>
64+
</Reference>
65+
<Reference Include="System" />
66+
<Reference Include="System.ComponentModel.DataAnnotations" />
67+
<Reference Include="System.Core" />
68+
<Reference Include="System.Web.Mvc">
69+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
70+
</Reference>
71+
<Reference Include="System.Xml.Linq" />
72+
<Reference Include="System.Data.DataSetExtensions" />
73+
<Reference Include="Microsoft.CSharp" />
74+
<Reference Include="System.Data" />
75+
<Reference Include="System.Net.Http" />
76+
<Reference Include="System.Xml" />
77+
</ItemGroup>
78+
<ItemGroup>
79+
<Compile Include="AccountViewModels.cs" />
80+
<Compile Include="ColumnInfo.cs" />
81+
<Compile Include="CreditCard.cs" />
82+
<Compile Include="CreditCardNetwork.cs" />
83+
<Compile Include="CreditCardNetworks.cs" />
84+
<Compile Include="IdentityModels.cs" />
85+
<Compile Include="ManageViewModels.cs" />
86+
<Compile Include="Properties\AssemblyInfo.cs" />
87+
</ItemGroup>
88+
<ItemGroup>
89+
<None Include="app.config" />
90+
<None Include="packages.config">
91+
<SubType>Designer</SubType>
92+
</None>
93+
</ItemGroup>
94+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
96+
Other similar extension points exist, see Microsoft.Common.targets.
97+
<Target Name="BeforeBuild">
98+
</Target>
99+
<Target Name="AfterBuild">
100+
</Target>
101+
-->
102+
</Project>

‎AlwaysEncryptedSample/Models/ColumnInfo.cs renamed to ‎AlwaysEncryptedSample.Models/ColumnInfo.cs

File renamed without changes.

0 commit comments

Comments
 (0)