Skip to content

Commit 5e3f365

Browse files
authored
Merge pull request #13 from arichika/develop
1.0.3
2 parents fb1e717 + fd7391a commit 5e3f365

Some content is hidden

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

48 files changed

+405
-280
lines changed

.gitignore

Lines changed: 144 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,39 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
3+
##
4+
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
35

46
# User-specific files
57
*.suo
68
*.user
9+
*.userosscache
710
*.sln.docstates
811

12+
# User-specific files (MonoDevelop/Xamarin Studio)
13+
*.userprefs
14+
915
# Build results
1016
[Dd]ebug/
1117
[Dd]ebugPublic/
1218
[Rr]elease/
19+
[Rr]eleases/
1320
x64/
14-
build/
21+
x86/
1522
bld/
1623
[Bb]in/
1724
[Oo]bj/
25+
[Ll]og/
26+
27+
# Visual Studio 2015 cache/options directory
28+
.vs/
29+
# Uncomment if you have tasks that create the project's static files in wwwroot
30+
#wwwroot/
1831

1932
# MSTest test Results
2033
[Tt]est[Rr]esult*/
2134
[Bb]uild[Ll]og.*
2235

23-
#NUNIT
36+
# NUNIT
2437
*.VisualState.xml
2538
TestResult.xml
2639

@@ -29,6 +42,15 @@ TestResult.xml
2942
[Rr]eleasePS/
3043
dlldata.c
3144

45+
# Benchmark Results
46+
BenchmarkDotNet.Artifacts/
47+
48+
# .NET Core
49+
project.lock.json
50+
project.fragment.lock.json
51+
artifacts/
52+
**/Properties/launchSettings.json
53+
3254
*_i.c
3355
*_p.c
3456
*_i.h
@@ -61,14 +83,18 @@ _Chutzpah*
6183
ipch/
6284
*.aps
6385
*.ncb
86+
*.opendb
6487
*.opensdf
6588
*.sdf
6689
*.cachefile
90+
*.VC.db
91+
*.VC.VC.opendb
6792

6893
# Visual Studio profiler
6994
*.psess
7095
*.vsp
7196
*.vspx
97+
*.sap
7298

7399
# TFS 2012 Local Workspace
74100
$tf/
@@ -81,7 +107,7 @@ _ReSharper*/
81107
*.[Rr]e[Ss]harper
82108
*.DotSettings.user
83109

84-
# JustCode is a .NET coding addin-in
110+
# JustCode is a .NET coding add-in
85111
.JustCode
86112

87113
# TeamCity is a build add-in
@@ -90,10 +116,14 @@ _TeamCity*
90116
# DotCover is a Code Coverage Tool
91117
*.dotCover
92118

119+
# Visual Studio code coverage results
120+
*.coverage
121+
*.coveragexml
122+
93123
# NCrunch
94-
*.ncrunch*
95124
_NCrunch_*
96125
.*crunch*.local.xml
126+
nCrunchTemp_*
97127

98128
# MightyMoose
99129
*.mm.*
@@ -121,41 +151,70 @@ publish/
121151
# Publish Web Output
122152
*.[Pp]ublish.xml
123153
*.azurePubxml
124-
125-
# NuGet Packages Directory
126-
packages/
127-
## TODO: If the tool you use requires repositories.config uncomment the next line
128-
#!packages/repositories.config
129-
130-
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
131-
# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
132-
!packages/build/
133-
134-
# Windows Azure Build Output
154+
# TODO: Comment the next line if you want to checkin your web deploy settings
155+
# but database connection strings (with potential passwords) will be unencrypted
156+
*.pubxml
157+
*.publishproj
158+
159+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
160+
# checkin your Azure Web App publish settings, but sensitive information contained
161+
# in these scripts will be unencrypted
162+
PublishScripts/
163+
164+
# NuGet Packages
165+
*.nupkg
166+
# The packages folder can be ignored because of Package Restore
167+
**/packages/*
168+
# except build/, which is used as an MSBuild target.
169+
!**/packages/build/
170+
# Uncomment if necessary however generally it will be regenerated when needed
171+
#!**/packages/repositories.config
172+
# NuGet v3's project.json files produces more ignorable files
173+
*.nuget.props
174+
*.nuget.targets
175+
176+
# Microsoft Azure Build Output
135177
csx/
136178
*.build.csdef
137179

138-
# Windows Store app package directory
180+
# Microsoft Azure Emulator
181+
ecf/
182+
rcf/
183+
184+
# Windows Store app package directories and files
139185
AppPackages/
186+
BundleArtifacts/
187+
Package.StoreAssociation.xml
188+
_pkginfo.txt
189+
*.appx
190+
191+
# Visual Studio cache files
192+
# files ending in .cache can be ignored
193+
*.[Cc]ache
194+
# but keep track of directories ending in .cache
195+
!*.[Cc]ache/
140196

141197
# Others
142-
sql/
143-
*.Cache
144198
ClientBin/
145-
[Ss]tyle[Cc]op.*
146199
~$*
147200
*~
148201
*.dbmdl
149202
*.dbproj.schemaview
203+
*.jfm
150204
*.pfx
151205
*.publishsettings
152-
node_modules/
206+
orleans.codegen.cs
207+
208+
# Since there are multiple workflows, uncomment next line to ignore bower_components
209+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
210+
#bower_components/
153211

154212
# RIA/Silverlight projects
155213
Generated_Code/
156214

157-
# Backup & report files from converting an old project file to a newer
158-
# Visual Studio version. Backup files are not needed, because we have git ;-)
215+
# Backup & report files from converting an old project file
216+
# to a newer Visual Studio version. Backup files are not needed,
217+
# because we have git ;-)
159218
_UpgradeReport_Files/
160219
Backup*/
161220
UpgradeLog*.XML
@@ -164,6 +223,7 @@ UpgradeLog*.htm
164223
# SQL Server files
165224
*.mdf
166225
*.ldf
226+
*.ndf
167227

168228
# Business Intelligence projects
169229
*.rdl.data
@@ -172,3 +232,65 @@ UpgradeLog*.htm
172232

173233
# Microsoft Fakes
174234
FakesAssemblies/
235+
236+
# GhostDoc plugin setting file
237+
*.GhostDoc.xml
238+
239+
# Node.js Tools for Visual Studio
240+
.ntvs_analysis.dat
241+
node_modules/
242+
243+
# Typescript v1 declaration files
244+
typings/
245+
246+
# Visual Studio 6 build log
247+
*.plg
248+
249+
# Visual Studio 6 workspace options file
250+
*.opt
251+
252+
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
253+
*.vbw
254+
255+
# Visual Studio LightSwitch build output
256+
**/*.HTMLClient/GeneratedArtifacts
257+
**/*.DesktopClient/GeneratedArtifacts
258+
**/*.DesktopClient/ModelManifest.xml
259+
**/*.Server/GeneratedArtifacts
260+
**/*.Server/ModelManifest.xml
261+
_Pvt_Extensions
262+
263+
# Paket dependency manager
264+
.paket/paket.exe
265+
paket-files/
266+
267+
# FAKE - F# Make
268+
.fake/
269+
270+
# JetBrains Rider
271+
.idea/
272+
*.sln.iml
273+
274+
# CodeRush
275+
.cr/
276+
277+
# Python Tools for Visual Studio (PTVS)
278+
__pycache__/
279+
*.pyc
280+
281+
# Cake - Uncomment if you are using it
282+
# tools/**
283+
# !tools/packages.config
284+
285+
# Tabs Studio
286+
*.tss
287+
288+
# Telerik's JustMock configuration file
289+
*.jmconfig
290+
291+
# BizTalk build output
292+
*.btp.cs
293+
*.btm.cs
294+
*.odx.cs
295+
*.xsd.cs
296+
/Src/SampleWebSite/MyConnectionStrings.config

README.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ This is an example to implement a OracleDatabase store for ASP.NET Identity 2.0
1616

1717
Steps to run project
1818

19-
- Open project in VS with Update 2 or later installed
19+
- Open project in Latest Visual Studio 2017 or later installed
2020
- Build project to restore packages and build project
2121
- In the solution, add a new one ASP.NET project with MVC and Individual Authentication
2222
- Uninstall Microsoft.AspNet.Identity.EntityFramework package from the web application
2323
- Update connection string to use the OracleDatabase database as needed
24-
- Make the file "MyConnectionStrings.config" into the project SampleWebSite's root folder
25-
- e.g.
26-
```
24+
- Make the file `MyConnectionStrings.config` into the project SampleWebSite's root folder
25+
- e.g.
26+
```
2727
<?xml version="1.0" encoding="utf-8"?>
2828
<connectionStrings>
2929
<add name="DefaultConnection"
3030
connectionString="Data Source=OracleDbTnsName; User Id=scott;Password=tiger;"
3131
providerName="Oracle.DataAccess.Client" />
3232
</connectionStrings>
33-
```
33+
```
3434
- In the IdentityModel.cs (in the SampleWebProject),
3535
let ApplicationUser class extend from Identity user in AspNet.Identity.Oracle
36-
- e.g
37-
```
36+
- e.g
37+
```
3838
using AspNet.Identity.Oracle;
3939
// using Microsoft.AspNet.Identity.EntityFramework;
40-
```
40+
```
4141
- ApplicationDbContext extend from OracleDatabase and the contructor take a single parameter with the connectionstring name
4242
```
4343
public class ApplicationDbContext : OracleDatabase
@@ -61,18 +61,17 @@ var manager = new ApplicationRoleManager(new RoleStore<IdentityRole>(context.Get
6161
you can write some code block at the InitializeDb method or InitializeIdentity method
6262
in the ApplicationDbInitializer class (in the IdentityConfig.cs)
6363
- This SampleWebSite project enabled initial admin account as shoen below
64-
```
64+
```
6565
const string name = "admin@admin.com";
6666
const string password = "Admin@123456";
6767
const string roleName = "Admin";
68-
```
68+
```
6969
- Before you do debugging, you must create the tables in the database.
70-
Please run DDL Script, "OracleIdentity.sql.txt" in the AspNet.Identity.Oracle project.
70+
Please run DDL Script, `OracleIdentity.sql.txt` in the AspNet.Identity.Oracle project.
7171

7272
- If you have an error appears at the start of debugging, please try the following below.
73-
- To start the Visual Studio by "Run as Administrator".
74-
- Debugging on the "Local IIS" not "IIS Express".
75-
- Check build platform Win32 or x64, this project and installed ODP.NET.
73+
- Debugging on the `IIS Express`.
74+
- Check build platform Win32 or x64, this project and installed ODP.NET. (means Not Oracle.ManagedAccess)
7675

7776

7877
Notice

Src/AspNet.Identity.Oracle/AspNet.Identity.Oracle.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5959
</PropertyGroup>
6060
<ItemGroup>
61-
<Reference Include="Microsoft.AspNet.Identity.Core">
62-
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.0.0\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
61+
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Oracle.DataAccess, Version=4.112.3.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
6565
<SpecificVersion>False</SpecificVersion>

Src/AspNet.Identity.Oracle/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.0.3.0")]
36+
[assembly: AssemblyFileVersion("1.0.3.0")]

0 commit comments

Comments
 (0)