Skip to content

Commit a7f0fd6

Browse files
committed
vb
1 parent 37dc6dd commit a7f0fd6

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

Diff for: VB/HtmlJavaScriptApp/HtmlJavaScriptApp.vbproj

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -46,10 +46,11 @@
4646
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
4747
</PropertyGroup>
4848
<ItemGroup>
49-
<Reference Include="DevExpress.Dashboard.v21.2.Core, Version=21.2.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
50-
<Reference Include="DevExpress.Dashboard.v21.2.Web, Version=21.2.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
51-
<Reference Include="DevExpress.Dashboard.v21.2.Web.Mvc5, Version=21.2.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52-
<Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.11.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
49+
<Reference Include="DevExpress.Dashboard.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
50+
<Reference Include="DevExpress.Dashboard.v22.2.Web, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
51+
<Reference Include="DevExpress.Dashboard.v22.2.Web.Mvc5, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52+
<Reference Include="DevExpress.DataAccess.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
53+
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
5354
<Reference Include="System" />
5455
<Reference Include="System.Data" />
5556
<Reference Include="System.Drawing" />
@@ -89,9 +90,6 @@
8990
<Reference Include="System.Web.Mvc">
9091
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
9192
</Reference>
92-
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
93-
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
94-
</Reference>
9593
</ItemGroup>
9694
<ItemGroup>
9795
<Import Include="Microsoft.VisualBasic" />
@@ -231,4 +229,4 @@
231229
<Target Name="AfterBuild">
232230
</Target>
233231
-->
234-
</Project>
232+
</Project>

Diff for: VB/HtmlJavaScriptApp/Web.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1212
</appSettings>
1313
<connectionStrings>
14-
<add name="nwindConnection" connectionString="XpoProvider=MSAccess; Provider=Microsoft.Jet.OLEDB.4.0; Data Source=|DataDirectory|\nwind.mdb;" />
14+
<add name="nwindConnection" connectionString="XpoProvider=MSAccess; Provider=Microsoft.ACE.OLEDB.12.0; Data Source=|DataDirectory|\nwind.mdb;" />
1515
</connectionStrings>
1616
<system.web>
1717
<compilation debug="true" targetFramework="4.7.2" />
@@ -29,7 +29,7 @@
2929
</dependentAssembly>
3030
<dependentAssembly>
3131
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
32-
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
32+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
3333
</dependentAssembly>
3434
</assemblyBinding>
3535
</runtime>

Diff for: VB/HtmlJavaScriptApp/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<link href="node_modules/devexpress-dashboard/dist/css/dx-dashboard.light.min.css" rel="stylesheet" />
1414

1515
<script src="node_modules/jquery/dist/jquery.js"></script>
16-
<script src="node_modules/jquery-ui-dist/jquery-ui.js"></script>
1716

1817
<script src="node_modules/knockout/build/output/knockout-latest.js"></script>
1918

Diff for: VB/HtmlJavaScriptApp/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
"name": "asp.net",
44
"private": true,
55
"devDependencies": {
6-
"devextreme": "21.2-stable",
7-
"@devexpress/analytics-core": "21.2-stable",
8-
"devexpress-dashboard": "21.2-stable",
9-
"jquery-ui-dist": "1.12.1"
6+
"devextreme": "22.2.3",
7+
"@devexpress/analytics-core": "22.2.3",
8+
"devexpress-dashboard": "22.2.3"
109
}
1110
}

0 commit comments

Comments
 (0)