Skip to content

Commit df10532

Browse files
committed
3.6.0.400
1 parent e039371 commit df10532

Some content is hidden

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

47 files changed

+130
-198
lines changed

CookieStorage/CookieStorage.csproj

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,9 @@
133133
<Content Include="Scripts\jquery-1.10.2.min.map" />
134134
</ItemGroup>
135135
<ItemGroup>
136-
<Reference Include="ActiveQueryBuilder.Core">
137-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.40.1158\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
138-
</Reference>
139-
<Reference Include="ActiveQueryBuilder.View">
140-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.10\lib\net\ActiveQueryBuilder.View.dll</HintPath>
141-
</Reference>
142-
<Reference Include="ActiveQueryBuilder.Web.Server">
143-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.10\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
144-
</Reference>
136+
<Reference Include="ActiveQueryBuilder.Core, Version=3.6.0.1159, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
137+
<Reference Include="ActiveQueryBuilder.View, Version=3.6.0.1159, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
138+
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.6.0.400, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
145139
</ItemGroup>
146140
<PropertyGroup>
147141
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

CookieStorage/CookieStorage.nuget.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
44
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
55
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6-
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\src\Samples\ASP.NET\Samples C#\CookieStorage\project.lock.json</ProjectAssetsFile>
6+
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\src\Samples\ASP.NET\Samples CSharp\CookieStorage\project.lock.json</ProjectAssetsFile>
77
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\packages</NuGetPackageRoot>
88
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\packages</NuGetPackageFolders>
99
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>

CookieStorage/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("CookieStorage")]
13-
[assembly: AssemblyCopyright("Copyright © 2018")]
13+
[assembly: AssemblyCopyright("Copyright © 2018-2020 Active Database Software")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

CookieStorage/aqb.client.js

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

CookieStorage/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.5.40.1158",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.40.1158",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.40.1158",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.40.1158",
7-
"ActiveQueryBuilder.Web.MVC": "3.4.10",
3+
"ActiveQueryBuilder.Core": "3.6.0.1159",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.6.0.1159",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.6.0.1159",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.6.0.1159",
7+
"ActiveQueryBuilder.Web.MVC": "3.6.0",
88
"Antlr": "3.4.1.9004",
99
"bootstrap": "3.0.0",
1010
"jQuery": "1.10.2",

CookieStorage/project.lock.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -546,12 +546,12 @@
546546
},
547547
"project": {
548548
"restore": {
549-
"projectUniqueName": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples C#\\CookieStorage\\CookieStorage.csproj",
549+
"projectUniqueName": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples CSharp\\CookieStorage\\CookieStorage.csproj",
550550
"projectName": "CookieStorage",
551-
"projectPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples C#\\CookieStorage\\CookieStorage.csproj",
552-
"projectJsonPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples C#\\CookieStorage\\project.json",
551+
"projectPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples CSharp\\CookieStorage\\CookieStorage.csproj",
552+
"projectJsonPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples CSharp\\CookieStorage\\project.json",
553553
"packagesPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\packages",
554-
"outputPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples C#\\CookieStorage\\obj\\",
554+
"outputPath": "C:\\TeamCity_work\\ActiveQueryBuilderASP.NET3.0_1\\ASP\\src\\Samples\\ASP.NET\\Samples CSharp\\CookieStorage\\obj\\",
555555
"projectStyle": "ProjectJson",
556556
"validateRuntimeAssets": true,
557557
"configFilePaths": [

CrossDomain/CrossDomain.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,8 @@
144144
<Content Include="Scripts\jquery-1.10.2.min.map" />
145145
</ItemGroup>
146146
<ItemGroup>
147-
<Reference Include="ActiveQueryBuilder.Core">
148-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.40.1158\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
149-
</Reference>
150-
<Reference Include="ActiveQueryBuilder.Web.Server">
151-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.10\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
152-
</Reference>
147+
<Reference Include="ActiveQueryBuilder.Core, Version=3.6.0.1159, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
148+
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.6.0.400, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
153149
</ItemGroup>
154150
<PropertyGroup>
155151
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

CrossDomain/CrossDomain.nuget.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
44
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
55
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6-
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\src\Samples\ASP.NET\Samples C#\CrossDomain\project.lock.json</ProjectAssetsFile>
6+
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\src\Samples\ASP.NET\Samples CSharp\CrossDomain\project.lock.json</ProjectAssetsFile>
77
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\packages</NuGetPackageRoot>
88
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\TeamCity_work\ActiveQueryBuilderASP.NET3.0_1\ASP\packages</NuGetPackageFolders>
99
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>

CrossDomain/FrontEnd/aqb.client.js

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

CrossDomain/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("CrossDomain")]
13-
[assembly: AssemblyCopyright("Copyright © 2018")]
13+
[assembly: AssemblyCopyright("Copyright © 2018-2020 Active Database Software")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

0 commit comments

Comments
 (0)