Skip to content

Commit

Permalink
upgraded dependencies and removed submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkis117 committed Jan 6, 2017
1 parent 01e71a1 commit bcaf274
Show file tree
Hide file tree
Showing 10 changed files with 15,681 additions and 6,877 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "Mime-Detective"]
path = Mime-Detective
url = https://github.com/clarkis117/Mime-Detective.git
17 changes: 3 additions & 14 deletions GenericMvcUtilities.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76C8C261-C3E
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{299FF47C-9D8E-415A-8301-F4DDA828A2D1}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
global.json = global.json
License.txt = License.txt
README.md = README.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GenericMvcUtilities", "src\GenericMvcUtilities\GenericMvcUtilities.xproj", "{4A5D4291-1E31-4721-956B-681C4CF87B3B}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MimeDetective", "Mime-Detective\MimeDetective\MimeDetective.xproj", "{9E3066B2-B987-4E32-83D4-16A20E3BA219}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GenericMvcUtilities.Tests", "src\GenericMvcUtilitiesTests\GenericMvcUtilities.Tests.xproj", "{362A372D-56C5-4F97-8681-9C9FF40CE30A}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MimeDetectiveTests", "Mime-Detective\MimeDetectiveTests\MimeDetectiveTests.xproj", "{CB3A9BEA-C247-4FEB-8670-98E3034FC214}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GenericMvcUtilities.Test.Library", "src\GenericMvcUtilities.Test.Library\GenericMvcUtilities.Test.Library.xproj", "{0D63026E-6537-4BFA-890C-5D0A2485DF60}"
EndProject
Global
Expand All @@ -30,18 +29,10 @@ Global
{4A5D4291-1E31-4721-956B-681C4CF87B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A5D4291-1E31-4721-956B-681C4CF87B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A5D4291-1E31-4721-956B-681C4CF87B3B}.Release|Any CPU.Build.0 = Release|Any CPU
{9E3066B2-B987-4E32-83D4-16A20E3BA219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E3066B2-B987-4E32-83D4-16A20E3BA219}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E3066B2-B987-4E32-83D4-16A20E3BA219}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E3066B2-B987-4E32-83D4-16A20E3BA219}.Release|Any CPU.Build.0 = Release|Any CPU
{362A372D-56C5-4F97-8681-9C9FF40CE30A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{362A372D-56C5-4F97-8681-9C9FF40CE30A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{362A372D-56C5-4F97-8681-9C9FF40CE30A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{362A372D-56C5-4F97-8681-9C9FF40CE30A}.Release|Any CPU.Build.0 = Release|Any CPU
{CB3A9BEA-C247-4FEB-8670-98E3034FC214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB3A9BEA-C247-4FEB-8670-98E3034FC214}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB3A9BEA-C247-4FEB-8670-98E3034FC214}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB3A9BEA-C247-4FEB-8670-98E3034FC214}.Release|Any CPU.Build.0 = Release|Any CPU
{0D63026E-6537-4BFA-890C-5D0A2485DF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D63026E-6537-4BFA-890C-5D0A2485DF60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D63026E-6537-4BFA-890C-5D0A2485DF60}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -52,9 +43,7 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4A5D4291-1E31-4721-956B-681C4CF87B3B} = {76C8C261-C3E5-4708-A352-41C0510CB3A0}
{9E3066B2-B987-4E32-83D4-16A20E3BA219} = {76C8C261-C3E5-4708-A352-41C0510CB3A0}
{362A372D-56C5-4F97-8681-9C9FF40CE30A} = {76C8C261-C3E5-4708-A352-41C0510CB3A0}
{CB3A9BEA-C247-4FEB-8670-98E3034FC214} = {76C8C261-C3E5-4708-A352-41C0510CB3A0}
{0D63026E-6537-4BFA-890C-5D0A2485DF60} = {76C8C261-C3E5-4708-A352-41C0510CB3A0}
EndGlobalSection
EndGlobal
1 change: 0 additions & 1 deletion Mime-Detective
Submodule Mime-Detective deleted from ecd0b1
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test", "Mime-Detective", "../Mime-Detective" ],
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview2-003121"
"version": "1.0.0-preview2-003131"
}
}
45 changes: 24 additions & 21 deletions src/GenericMvcUtilities.Test.Library/project.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
{
"version": "1.0.0",
"version": "1.0.0",

"dependencies": {
"xunit": "2.2.0-beta2-build3300",
"NETStandard.Library": "1.6.0",
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
"Microsoft.EntityFrameworkCore.InMemory": "1.0.0",
"GenFu": "1.1.1",
"Microsoft.EntityFrameworkCore": "1.0.0",
"GenericMvcUtilities": "1.0.*"
},
"frameworks": {
"netstandard1.6": {
"dependencies": {
"buildOptions": {
"warningsAsErrors": false,
"preserveCompilationContext": true
},

},
"imports": [
"dotnet5.6",
"dnxcore50",
"portable-net451+win8"
]
}
}
"dependencies": {
"xunit": "2.1.0",
"NETStandard.Library": "1.6.1",
"Microsoft.AspNetCore.TestHost": "1.1.0",
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.0",
"Microsoft.EntityFrameworkCore.InMemory": "1.1.0",
"GenFu": "1.2.1",
"GenericMvcUtilities": { "target": "project" }
},
"frameworks": {
"net4.6": {
},
"netstandard1.6": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
}
}
Loading

0 comments on commit bcaf274

Please sign in to comment.