Skip to content

Commit dc725b8

Browse files
mcintyre321mcintyre321
committed
CHanged namespace for embedded resources so that they match assembly name
1 parent 1b0d778 commit dc725b8

File tree

5 files changed

+34
-36
lines changed

5 files changed

+34
-36
lines changed

‎Mvc.JQuery.DataTables.Common/Mvc.JQuery.DataTables.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
5-
<RootNamespace>Mvc.JQuery.DataTables</RootNamespace>
5+
<RootNamespace>Mvc.JQuery.DataTables.Common</RootNamespace>
66
<AssemblyName>Mvc.JQuery.DataTables.Common</AssemblyName>
77
<PackageId>Mvc.JQuery.DataTables.Common</PackageId>
88
</PropertyGroup>

‎Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
</ItemGroup>
593593
<ItemGroup>
594594
<ProjectReference Include="..\Mvc.JQuery.DataTables.Common\Mvc.JQuery.DataTables.Common.csproj">
595-
<Project>{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}</Project>
595+
<Project>{bfd9ea5a-fe3a-4ce2-9c09-b9e78ce208ee}</Project>
596596
<Name>Mvc.JQuery.DataTables.Common</Name>
597597
</ProjectReference>
598598
<ProjectReference Include="..\Mvc.JQuery.DataTables\Mvc.JQuery.DataTables.csproj">

‎Mvc.JQuery.Datatables.Example/project.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -977,11 +977,11 @@
977977
"frameworks": {
978978
"net451": {
979979
"projectReferences": {
980-
"C:\\Users\\Harry\\OneDrive\\stuff\\mvc.jquery.datatables\\Mvc.JQuery.DataTables.Common\\Mvc.JQuery.DataTables.Common.csproj": {
981-
"projectPath": "C:\\Users\\Harry\\OneDrive\\stuff\\mvc.jquery.datatables\\Mvc.JQuery.DataTables.Common\\Mvc.JQuery.DataTables.Common.csproj"
982-
},
983980
"C:\\Users\\Harry\\OneDrive\\stuff\\mvc.jquery.datatables\\Mvc.JQuery.DataTables\\Mvc.JQuery.DataTables.csproj": {
984981
"projectPath": "C:\\Users\\Harry\\OneDrive\\stuff\\mvc.jquery.datatables\\Mvc.JQuery.DataTables\\Mvc.JQuery.DataTables.csproj"
982+
},
983+
"C:\\Users\\Harry\\OneDrive\\stuff\\mvc.jquery.datatables\\Mvc.JQuery.DataTables.Common\\Mvc.JQuery.DataTables.Common.csproj": {
984+
"projectPath": "C:\\Users\\Harry\\OneDrive\\stuff\\mvc.jquery.datatables\\Mvc.JQuery.DataTables.Common\\Mvc.JQuery.DataTables.Common.csproj"
985985
}
986986
}
987987
}

‎Mvc.JQuery.Datatables.sln‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26206.0
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.DataTables.Templates", "Mvc.JQuery.DataTables.Templates\Mvc.JQuery.DataTables.Templates.csproj", "{8DA3D5E6-D714-40C3-B6CB-E88D852C5175}"
77
EndProject
@@ -14,11 +14,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.DataTables", "Mv
1414
EndProject
1515
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.DataTables.Example", "Mvc.JQuery.DataTables.Example\Mvc.JQuery.DataTables.Example.csproj", "{476D3266-8699-4E89-A528-646C1235EEB1}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.DataTables.Common", "Mvc.JQuery.DataTables.Common\Mvc.JQuery.DataTables.Common.csproj", "{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.JQuery.DataTables.Common", "Mvc.JQuery.DataTables.Common\Mvc.JQuery.DataTables.Common.csproj", "{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.DataTables.AspNetCore.Example", "Mvc.JQuery.DataTables.AspNetCore.Example\Mvc.JQuery.DataTables.AspNetCore.Example.csproj", "{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.JQuery.DataTables.AspNetCore.Example", "Mvc.JQuery.DataTables.AspNetCore.Example\Mvc.JQuery.DataTables.AspNetCore.Example.csproj", "{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}"
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.DataTables.AspNetCore", "Mvc.JQuery.DataTables.AspNetCore\Mvc.JQuery.DataTables.AspNetCore.csproj", "{59A635A9-751E-4457-BC54-65F85A9AE317}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.JQuery.DataTables.AspNetCore", "Mvc.JQuery.DataTables.AspNetCore\Mvc.JQuery.DataTables.AspNetCore.csproj", "{59A635A9-751E-4457-BC54-65F85A9AE317}"
2222
EndProject
2323
Global
2424
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,40 +80,40 @@ Global
8080
{476D3266-8699-4E89-A528-646C1235EEB1}.Release|x86.Build.0 = Release|Any CPU
8181
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8282
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
83-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x64.ActiveCfg = Debug|x64
84-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x64.Build.0 = Debug|x64
85-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x86.ActiveCfg = Debug|x86
86-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x86.Build.0 = Debug|x86
83+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x64.ActiveCfg = Debug|Any CPU
84+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x64.Build.0 = Debug|Any CPU
85+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x86.ActiveCfg = Debug|Any CPU
86+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Debug|x86.Build.0 = Debug|Any CPU
8787
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
8888
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|Any CPU.Build.0 = Release|Any CPU
89-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x64.ActiveCfg = Release|x64
90-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x64.Build.0 = Release|x64
91-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x86.ActiveCfg = Release|x86
92-
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x86.Build.0 = Release|x86
89+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x64.ActiveCfg = Release|Any CPU
90+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x64.Build.0 = Release|Any CPU
91+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x86.ActiveCfg = Release|Any CPU
92+
{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}.Release|x86.Build.0 = Release|Any CPU
9393
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9494
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
95-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x64.ActiveCfg = Debug|x64
96-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x64.Build.0 = Debug|x64
97-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x86.ActiveCfg = Debug|x86
98-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x86.Build.0 = Debug|x86
95+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x64.ActiveCfg = Debug|Any CPU
96+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x64.Build.0 = Debug|Any CPU
97+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x86.ActiveCfg = Debug|Any CPU
98+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Debug|x86.Build.0 = Debug|Any CPU
9999
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
100100
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|Any CPU.Build.0 = Release|Any CPU
101-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x64.ActiveCfg = Release|x64
102-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x64.Build.0 = Release|x64
103-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x86.ActiveCfg = Release|x86
104-
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x86.Build.0 = Release|x86
101+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x64.ActiveCfg = Release|Any CPU
102+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x64.Build.0 = Release|Any CPU
103+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x86.ActiveCfg = Release|Any CPU
104+
{57EE5CEB-3CA4-4740-A140-585C0EFEBAD3}.Release|x86.Build.0 = Release|Any CPU
105105
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106106
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|Any CPU.Build.0 = Debug|Any CPU
107-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x64.ActiveCfg = Debug|x64
108-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x64.Build.0 = Debug|x64
109-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x86.ActiveCfg = Debug|x86
110-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x86.Build.0 = Debug|x86
107+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x64.ActiveCfg = Debug|Any CPU
108+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x64.Build.0 = Debug|Any CPU
109+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x86.ActiveCfg = Debug|Any CPU
110+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Debug|x86.Build.0 = Debug|Any CPU
111111
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|Any CPU.ActiveCfg = Release|Any CPU
112112
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|Any CPU.Build.0 = Release|Any CPU
113-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x64.ActiveCfg = Release|x64
114-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x64.Build.0 = Release|x64
115-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x86.ActiveCfg = Release|x86
116-
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x86.Build.0 = Release|x86
113+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x64.ActiveCfg = Release|Any CPU
114+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x64.Build.0 = Release|Any CPU
115+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x86.ActiveCfg = Release|Any CPU
116+
{59A635A9-751E-4457-BC54-65F85A9AE317}.Release|x86.Build.0 = Release|Any CPU
117117
EndGlobalSection
118118
GlobalSection(SolutionProperties) = preSolution
119119
HideSolutionNode = FALSE

‎appveyor.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ build_script:
1212
- cmd: >-
1313
git submodule update --init --recursive
1414
15-
16-
nuget restore
17-
dotnet restore
15+
1816
dotnet msbuild
1917
after_test:
2018
- cmd: >-

0 commit comments

Comments
 (0)