CaptchaReactNeuron
Changes
NeuralNetwork/NeuralNetwork.UI.Web/Web.config 48(+24 -24)
Details
diff --git a/NeuralNetwork/NeuralNetwork.UI.Web/Global.asax.cs b/NeuralNetwork/NeuralNetwork.UI.Web/Global.asax.cs
index 25d49c6..be163b7 100644
--- a/NeuralNetwork/NeuralNetwork.UI.Web/Global.asax.cs
+++ b/NeuralNetwork/NeuralNetwork.UI.Web/Global.asax.cs
@@ -22,9 +22,9 @@ namespace NeuralNetwork.UI.Web
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);
- AddBinToPathVar();
- TestNetworkRun();
- GCClear();
+ //AddBinToPathVar();
+ //TestNetworkRun();
+ //GCClear();
}
diff --git a/NeuralNetwork/NeuralNetwork.UI.Web/NeuralNetwork.UI.Web.csproj b/NeuralNetwork/NeuralNetwork.UI.Web/NeuralNetwork.UI.Web.csproj
index 80bc7ae..1de495d 100644
--- a/NeuralNetwork/NeuralNetwork.UI.Web/NeuralNetwork.UI.Web.csproj
+++ b/NeuralNetwork/NeuralNetwork.UI.Web/NeuralNetwork.UI.Web.csproj
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
+ <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')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,6 +27,7 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
+ <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -49,15 +51,15 @@
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+ <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -121,16 +123,52 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
+ <Content Include="Content\bootstrap-grid.css" />
+ <Content Include="Content\bootstrap-grid.min.css" />
+ <Content Include="Content\bootstrap-reboot.css" />
+ <Content Include="Content\bootstrap-reboot.min.css" />
+ <Content Include="Content\bootstrap.css" />
+ <Content Include="Content\bootstrap.min.css" />
<Content Include="Content\Site\Tools\Canvas.css" />
<Content Include="favicon.ico" />
- <Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Content\Site\Site.css" />
- <Content Include="fonts\glyphicons-halflings-regular.woff2" />
- <Content Include="fonts\glyphicons-halflings-regular.woff" />
- <Content Include="fonts\glyphicons-halflings-regular.ttf" />
- <Content Include="fonts\glyphicons-halflings-regular.eot" />
+ <Content Include="Content\bootstrap.min.css.map" />
+ <Content Include="Content\bootstrap.css.map" />
+ <Content Include="Content\bootstrap-reboot.min.css.map" />
+ <Content Include="Content\bootstrap-reboot.css.map" />
+ <Content Include="Content\bootstrap-grid.min.css.map" />
+ <Content Include="Content\bootstrap-grid.css.map" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
+ <Content Include="Scripts\bootstrap.bundle.js" />
+ <Content Include="Scripts\bootstrap.bundle.min.js" />
+ <Content Include="Scripts\bootstrap.js" />
+ <Content Include="Scripts\bootstrap.min.js" />
+ <Content Include="Scripts\esm\popper-utils.js" />
+ <Content Include="Scripts\esm\popper-utils.min.js" />
+ <Content Include="Scripts\esm\popper.js" />
+ <Content Include="Scripts\esm\popper.min.js" />
+ <Content Include="Scripts\index.js.flow" />
+ <Content Include="Scripts\esm\popper.min.js.map" />
+ <Content Include="Scripts\esm\popper.js.map" />
+ <Content Include="Scripts\esm\popper-utils.min.js.map" />
+ <Content Include="Scripts\esm\popper-utils.js.map" />
+ <Content Include="Scripts\bootstrap.min.js.map" />
+ <Content Include="Scripts\bootstrap.js.map" />
+ <Content Include="Scripts\bootstrap.bundle.min.js.map" />
+ <Content Include="Scripts\bootstrap.bundle.js.map" />
+ <None Include="Scripts\jquery-3.4.1.intellisense.js" />
+ <Content Include="Scripts\jquery-3.4.1.js" />
+ <Content Include="Scripts\jquery-3.4.1.min.js" />
+ <Content Include="Scripts\jquery-3.4.1.slim.js" />
+ <Content Include="Scripts\jquery-3.4.1.slim.min.js" />
+ <None Include="Scripts\jquery.validate-vsdoc.js" />
+ <Content Include="Scripts\jquery.validate.js" />
+ <Content Include="Scripts\jquery.validate.min.js" />
+ <Content Include="Scripts\popper-utils.js" />
+ <Content Include="Scripts\popper-utils.min.js" />
+ <Content Include="Scripts\popper.js" />
+ <Content Include="Scripts\popper.min.js" />
<Content Include="Scripts\Site\Api\API_TextRecognising.js" />
<Content Include="Scripts\Site\Pages\AppPage.js" />
<Content Include="Scripts\Site\Pages\ReactAppPage.jsx" />
@@ -139,6 +177,73 @@
<Content Include="Scripts\Site\ReactJS\react.production.min.js" />
<Content Include="Scripts\Site\Tools\Canvas.js" />
<Content Include="Scripts\Site\Pages\TestPage.js" />
+ <Content Include="Scripts\src\index.js" />
+ <Content Include="Scripts\src\methods\defaults.js" />
+ <Content Include="Scripts\src\methods\destroy.js" />
+ <Content Include="Scripts\src\methods\disableEventListeners.js" />
+ <Content Include="Scripts\src\methods\enableEventListeners.js" />
+ <Content Include="Scripts\src\methods\placements.js" />
+ <Content Include="Scripts\src\methods\update.js" />
+ <Content Include="Scripts\src\modifiers\applyStyle.js" />
+ <Content Include="Scripts\src\modifiers\arrow.js" />
+ <Content Include="Scripts\src\modifiers\computeStyle.js" />
+ <Content Include="Scripts\src\modifiers\flip.js" />
+ <Content Include="Scripts\src\modifiers\hide.js" />
+ <Content Include="Scripts\src\modifiers\index.js" />
+ <Content Include="Scripts\src\modifiers\inner.js" />
+ <Content Include="Scripts\src\modifiers\keepTogether.js" />
+ <Content Include="Scripts\src\modifiers\offset.js" />
+ <Content Include="Scripts\src\modifiers\preventOverflow.js" />
+ <Content Include="Scripts\src\modifiers\shift.js" />
+ <Content Include="Scripts\src\utils\clockwise.js" />
+ <Content Include="Scripts\src\utils\computeAutoPlacement.js" />
+ <Content Include="Scripts\src\utils\debounce.js" />
+ <Content Include="Scripts\src\utils\find.js" />
+ <Content Include="Scripts\src\utils\findCommonOffsetParent.js" />
+ <Content Include="Scripts\src\utils\findIndex.js" />
+ <Content Include="Scripts\src\utils\getBordersSize.js" />
+ <Content Include="Scripts\src\utils\getBoundaries.js" />
+ <Content Include="Scripts\src\utils\getBoundingClientRect.js" />
+ <Content Include="Scripts\src\utils\getClientRect.js" />
+ <Content Include="Scripts\src\utils\getFixedPositionOffsetParent.js" />
+ <Content Include="Scripts\src\utils\getOffsetParent.js" />
+ <Content Include="Scripts\src\utils\getOffsetRect.js" />
+ <Content Include="Scripts\src\utils\getOffsetRectRelativeToArbitraryNode.js" />
+ <Content Include="Scripts\src\utils\getOppositePlacement.js" />
+ <Content Include="Scripts\src\utils\getOppositeVariation.js" />
+ <Content Include="Scripts\src\utils\getOuterSizes.js" />
+ <Content Include="Scripts\src\utils\getParentNode.js" />
+ <Content Include="Scripts\src\utils\getPopperOffsets.js" />
+ <Content Include="Scripts\src\utils\getReferenceNode.js" />
+ <Content Include="Scripts\src\utils\getReferenceOffsets.js" />
+ <Content Include="Scripts\src\utils\getRoot.js" />
+ <Content Include="Scripts\src\utils\getRoundedOffsets.js" />
+ <Content Include="Scripts\src\utils\getScroll.js" />
+ <Content Include="Scripts\src\utils\getScrollParent.js" />
+ <Content Include="Scripts\src\utils\getStyleComputedProperty.js" />
+ <Content Include="Scripts\src\utils\getSupportedPropertyName.js" />
+ <Content Include="Scripts\src\utils\getViewportOffsetRectRelativeToArtbitraryNode.js" />
+ <Content Include="Scripts\src\utils\getWindow.js" />
+ <Content Include="Scripts\src\utils\getWindowSizes.js" />
+ <Content Include="Scripts\src\utils\includeScroll.js" />
+ <Content Include="Scripts\src\utils\index.js" />
+ <Content Include="Scripts\src\utils\isBrowser.js" />
+ <Content Include="Scripts\src\utils\isFixed.js" />
+ <Content Include="Scripts\src\utils\isFunction.js" />
+ <Content Include="Scripts\src\utils\isIE.js" />
+ <Content Include="Scripts\src\utils\isModifierEnabled.js" />
+ <Content Include="Scripts\src\utils\isModifierRequired.js" />
+ <Content Include="Scripts\src\utils\isNumeric.js" />
+ <Content Include="Scripts\src\utils\isOffsetContainer.js" />
+ <Content Include="Scripts\src\utils\removeEventListeners.js" />
+ <Content Include="Scripts\src\utils\runModifiers.js" />
+ <Content Include="Scripts\src\utils\setAttributes.js" />
+ <Content Include="Scripts\src\utils\setStyles.js" />
+ <Content Include="Scripts\src\utils\setupEventListeners.js" />
+ <Content Include="Scripts\umd\popper-utils.js" />
+ <Content Include="Scripts\umd\popper-utils.min.js" />
+ <Content Include="Scripts\umd\popper.js" />
+ <Content Include="Scripts\umd\popper.min.js" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
@@ -153,6 +258,18 @@
<Content Include="Views\Test\Index.cshtml" />
<Content Include="Views\App\Index.cshtml" />
<Content Include="Views\App\ReactIndex.cshtml" />
+ <Content Include="Scripts\jquery-3.4.1.slim.min.map" />
+ <Content Include="Scripts\jquery-3.4.1.min.map" />
+ <Content Include="Scripts\umd\popper.min.js.map" />
+ <Content Include="Scripts\umd\popper.js.map" />
+ <Content Include="Scripts\umd\popper.js.flow" />
+ <Content Include="Scripts\umd\popper-utils.min.js.map" />
+ <Content Include="Scripts\umd\popper-utils.js.map" />
+ <Content Include="Scripts\README.md" />
+ <Content Include="Scripts\popper.min.js.map" />
+ <Content Include="Scripts\popper.js.map" />
+ <Content Include="Scripts\popper-utils.min.js.map" />
+ <Content Include="Scripts\popper-utils.js.map" />
</ItemGroup>
<ItemGroup>
<Folder Include="Views\TextRecognising\" />
@@ -179,6 +296,12 @@
<Name>NeuralNetwork.PictureWork</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <TypeScriptCompile Include="Scripts\index.d.ts" />
+ </ItemGroup>
+ <ItemGroup>
+ <Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
+ </ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -203,6 +326,7 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
@@ -230,7 +354,7 @@
<PropertyGroup>
<ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+ <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/NeuralNetwork/NeuralNetwork.UI.Web/packages.config b/NeuralNetwork/NeuralNetwork.UI.Web/packages.config
index 904dd88..4af4df1 100644
--- a/NeuralNetwork/NeuralNetwork.UI.Web/packages.config
+++ b/NeuralNetwork/NeuralNetwork.UI.Web/packages.config
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net472" />
- <package id="bootstrap" version="3.4.1" targetFramework="net472" />
- <package id="jQuery" version="3.3.1" targetFramework="net472" />
- <package id="jQuery.Validation" version="1.17.0" targetFramework="net472" />
+ <package id="bootstrap" version="4.4.1" targetFramework="net472" />
+ <package id="jQuery" version="3.4.1" targetFramework="net472" />
+ <package id="jQuery.Validation" version="1.19.1" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.Mvc.ru" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
@@ -12,10 +12,11 @@
<package id="Microsoft.AspNet.Web.Optimization.ru" version="1.1.3" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages.ru" version="3.2.7" targetFramework="net472" />
- <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net472" />
+ <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net472" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
<package id="Modernizr" version="2.8.3" targetFramework="net472" />
- <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net472" />
+ <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
+ <package id="popper.js" version="1.16.0" targetFramework="net472" />
<package id="WebGrease" version="1.6.0" targetFramework="net472" />
</packages>
\ No newline at end of file
diff --git a/NeuralNetwork/NeuralNetwork.UI.Web/Scripts/Site/Tools/Canvas.js b/NeuralNetwork/NeuralNetwork.UI.Web/Scripts/Site/Tools/Canvas.js
index 2c00fd6..e618ff7 100644
--- a/NeuralNetwork/NeuralNetwork.UI.Web/Scripts/Site/Tools/Canvas.js
+++ b/NeuralNetwork/NeuralNetwork.UI.Web/Scripts/Site/Tools/Canvas.js
@@ -32,9 +32,9 @@ class Canvas {
//Нарисовать тестовую линию
PrintLine() {
- this.context.moveTo(0, 0);
- this.context.lineTo(200, 100);
- this.context.stroke();
+ //this.context.moveTo(0, 0);
+ //this.context.lineTo(200, 100);
+ //this.context.stroke();
}
//Очистить
diff --git a/NeuralNetwork/NeuralNetwork.UI.Web/Views/Shared/_Layout.cshtml b/NeuralNetwork/NeuralNetwork.UI.Web/Views/Shared/_Layout.cshtml
index 0fb0921..f133f65 100644
--- a/NeuralNetwork/NeuralNetwork.UI.Web/Views/Shared/_Layout.cshtml
+++ b/NeuralNetwork/NeuralNetwork.UI.Web/Views/Shared/_Layout.cshtml
@@ -9,24 +9,24 @@
@Scripts.Render("~/bundles/modernizr")
</head>
<body>
- <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar navbar-expand-sm navbar-dark fixed-top bg-dark">
<div class="container">
<div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
@Html.ActionLink("TextRecognising", "Index", "App", new { area = "" }, new { @class = "navbar-brand" })
</div>
- <div class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
+ <div class="navbar-collapse collapse" id="navbarSupportedContent">
+ <ul class="nav navbar-nav mr-auto">
@*<li>@Html.ActionLink("Домашняя страница", "Index", "Home")</li>
- <li>@Html.ActionLink("Информация", "About", "Home")</li>
- <li>@Html.ActionLink("Связаться", "Contact", "Home")</li>*@
- <li>@Html.ActionLink("TextRecognising", "Index", "App")</li>
- <li>@Html.ActionLink("React", "ReactIndex", "App")</li>
- <li>@Html.ActionLink("Test", "Index", "Test")</li>
+ <li>@Html.ActionLink("Информация", "About", "Home")</li>
+ <li>@Html.ActionLink("Связаться", "Contact", "Home")</li>*@
+ <li class="nav-item">@Html.ActionLink("TextRecognising", "Index", "App", null, new { @class = "nav-link" })</li>
+ <li class="nav-item">@Html.ActionLink("React", "ReactIndex", "App", null, new { @class = "nav-link" })</li>
+ <li class="nav-item">@Html.ActionLink("Test", "Index", "Test", null, new { @class = "nav-link" })</li>
</ul>
</div>
</div>
NeuralNetwork/NeuralNetwork.UI.Web/Web.config 48(+24 -24)
diff --git a/NeuralNetwork/NeuralNetwork.UI.Web/Web.config b/NeuralNetwork/NeuralNetwork.UI.Web/Web.config
index 197562b..227e046 100644
--- a/NeuralNetwork/NeuralNetwork.UI.Web/Web.config
+++ b/NeuralNetwork/NeuralNetwork.UI.Web/Web.config
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Дополнительные сведения о настройке приложения ASP.NET см. на странице
https://go.microsoft.com/fwlink/?LinkId=301880
-->
<configuration>
<appSettings>
- <add key="webpages:Version" value="3.0.0.0"/>
- <add key="webpages:Enabled" value="false"/>
- <add key="ClientValidationEnabled" value="true"/>
- <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+ <add key="webpages:Version" value="3.0.0.0" />
+ <add key="webpages:Enabled" value="false" />
+ <add key="ClientValidationEnabled" value="true" />
+ <add key="UnobtrusiveJavaScriptEnabled" value="true" />
</appSettings>
<!--
Описание изменений web.config см. по адресу http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -19,46 +19,46 @@
</system.Web>
-->
<system.web>
- <compilation debug="true" targetFramework="4.7.2"/>
- <httpRuntime targetFramework="4.5"/>
- <customErrors mode="Off"/>
+ <compilation debug="true" targetFramework="4.7.2" />
+ <httpRuntime targetFramework="4.5" />
+ <customErrors mode="Off" />
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
- <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
+ <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
+ <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
- <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
+ <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
- <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
+ <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
- <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
- <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+ <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
- <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+ <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
- <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+ <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
<compilers>
- <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
- <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+"/>
+ <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+ <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" />
</compilers>
</system.codedom>
</configuration>
\ No newline at end of file