浏览代码

提交待吗

zhouj1203@hotmail.com 5 年之前
父节点
当前提交
f46b53d104

+ 18 - 0
TEAMModelOS.Model/Evaluation/Dtos/Third/ExerciseInfo.cs

@@ -8,6 +8,8 @@ namespace TEAMModelOS.Model.EvaluaTion.Dtos
     [MessagePackObject]
     public class ExerciseInfo
     {
+        [Key("ExNO")]
+        public string ExNO { get; set; }
         [Key("ExName")]
         public string Ex_name { get; set; }
         [Key("ExTime")]
@@ -20,6 +22,12 @@ namespace TEAMModelOS.Model.EvaluaTion.Dtos
         public string Ex_mode { get; set; }
         [Key("CourseNO")]
         public string Course_no { get; set; }
+        [Key("CourseCode")]
+        public string Class_code { get; set; }
+        [Key("CourseName")]
+        public string Class_name { get; set; }
+        [Key("ClassID")]
+        public string Class_no { get; set; }
         [Key("ReportSubject")]
         public string Course_name { get; set; }
         [Key("SERIALNUMBER")]
@@ -28,7 +36,17 @@ namespace TEAMModelOS.Model.EvaluaTion.Dtos
         public string Stucount { get; set; }
         [Key("AvgScore")]
         public string AvgScore { get; set; }
+        [Key("QNumber")]
+        public string QNumber { get; set; }
         [IgnoreMember]
         public string Cover { get; set; } = "1";
+        [Key("SchoolName")]
+        public string SchoolName { get; set; }
+        [Key("GradeName")]
+        public string GradeName {get;set;}
+        [Key("AcademicYear")]
+        public string AcademicYear { get; set; }
+        [Key("SOrder")]
+        public string SOrder { get; set; }
     }
 }

+ 4 - 0
TEAMModelOS.Model/Evaluation/Dtos/Third/MemberAnswer.cs

@@ -8,6 +8,10 @@ namespace TEAMModelOS.Model.EvaluaTion.Dtos
     [MessagePackObject]
     public class MemberAnswer
     {
+        [Key("MemberID")]
+        public string StudentId { get; set; }
+        [Key("ExNO")]
+        public string ExNO { get; set; }
         [Key("ItemIndex")]
         public string Itemindex { get; set; }
         [Key("Selection")]

+ 11 - 10
TEAMModelOS.Model/Evaluation/Models/AnswerInfo.cs

@@ -11,7 +11,15 @@ namespace TEAMModelOS.Model.EvaluaTion.Models
     [MessagePackObject(keyAsPropertyName: true)]
     public class AnswerInfo : TableEntity
     {
-        public string Id { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        public string StudentId { get; set; }
+        /// <summary>
+        /// 考试ID
+        /// </summary>
+        public string ExNO { get; set; }
+
         /// <summary>
         /// 题序
         /// </summary>
@@ -24,14 +32,7 @@ namespace TEAMModelOS.Model.EvaluaTion.Models
         /// 得分
         /// </summary>
         public string Point { get; set; }
-        /// <summary>
-        /// 学号
-        /// </summary>
-        public string StudentId { get; set; }
-        /// <summary>
-        /// 考试ID
-        /// </summary>
-        public string ExId { get; set; }
-
+        
     }
 }
+

+ 28 - 0
TEAMModelOS.Model/Evaluation/Models/CosmosModels/Answer.cs

@@ -0,0 +1,28 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+
+namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
+{
+    [TableSpace(Name = "Evaluation")]
+    public class Answer
+    {
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+        public string Number { get; set; }
+        [PartitionKey]
+        public string ExNO { get; set; }
+        public string StudentId { get; set; }
+        public string Index { get; set; }
+        public float Point { get; set; }
+        public string Detail { get; set; }
+        public string CourseCode { get; set; }
+        public string ClassCode { get; set; }
+        public string GradeCode { get; set; }
+        public string SchoolCode { get; set; }
+        public string ExamName { get; set; }
+
+    }
+}

+ 16 - 0
TEAMModelOS.Model/Evaluation/Models/CosmosModels/BaseInfo.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+
+namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
+{
+    [TableSpace(Name = "Evaluation")]
+    public class BaseInfo
+    {
+        [PartitionKey]
+        public string Type { get; set; }
+        public string Code { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 26 - 0
TEAMModelOS.Model/Evaluation/Models/CosmosModels/CouseExam.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+
+namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
+{
+    [TableSpace(Name = "Evaluation")]
+    public class CouseExam
+    {
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+        public string Number { get; set; }
+        public string ExNO { get; set; }
+        public string ExName { get; set; }
+        public string ExTime { get; set; }
+        public int AcademicYear { get; set; }
+        public int SOrder { get; set; }
+        public string Subject { get; set; }
+        public string ItemNO { get; set; }
+        [PartitionKey]
+        public string SchoolName { get; set; }
+
+    }
+}

+ 20 - 0
TEAMModelOS.Model/Evaluation/Models/CosmosModels/Exam.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+
+namespace TEAMModelOS.Model.Evaluation.Models.CosmosModels
+{
+    [TableSpace(Name = "Evaluation")]
+    public class Exam
+    {
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+        [PartitionKey]
+        public string Number { get; set; }
+        public string Name { get; set; }
+        public string Time { get; set; }
+        public string SchoolName { get; set; }
+    }
+}

+ 1 - 0
TEAMModelOS.Model/Evaluation/Models/Evaluating.cs

@@ -26,6 +26,7 @@ namespace TEAMModelOS.Model.Evaluation.Models
         public string Subject { get; set; }
         /// <summary>
         /// 考试情景
+        /// 
         /// </summary>
         public string Scene { get; set; }
         /// <summary>

+ 58 - 3
TEAMModelOS.Model/Evaluation/Models/ExamInfo.cs

@@ -11,13 +11,68 @@ namespace TEAMModelOS.Model.EvaluaTion.Models
     [MessagePackObject(keyAsPropertyName: true)]
     public class ExamInfo : TableEntity
     {
-        public string Id { get; set; }
+
+        /// <summary>
+        /// 考试唯一标识
+        /// </summary>
+        public string ExId { get; set; }
+        /// <summary>
+        /// 学校编码
+        /// </summary>
+        public string SchoolCode { get; set; }
+        /// <summary>
+        /// 学校名称
+        /// </summary>
+        public string SchoolName { get; set; }
+        /// <summary>
+        /// 班级编码
+        /// </summary>
+        public string ClassCode { get; set; }
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+        /// <summary>
+        /// 年级名称
+        /// </summary>
+        public string GradeName { get; set; }
+        /// <summary>
+        /// 学期年份
+        /// </summary>
+        public int AcademicYear { get; set; } = 0;
+        /// <summary>
+        /// 区别上下学期
+        /// </summary>
+        public int SOrder { get; set; }
+        /// <summary>
+        /// 考试名称
+        /// </summary>
         public string ExName { get; set; }
         public string ExTime { get; set; }
         public string EndTime { get; set; }
-        public string  CouseName { get; set; }
+        /// <summary>
+        /// 科目名称
+        /// </summary>
+        public string CouseName { get; set; }
+        /// <summary>
+        /// 科目编码
+        /// </summary>
+        public string CouseCode { get; set; }
+        /// <summary>
+        /// 科目唯一标识
+        /// </summary>
+        public string CouseNO { get; set; }
         public string StuCount { get; set; }
-        public string AvgScore { get; set; }
+        public string QNumber { get; set; }
+        /// <summary>
+        /// 校平均分
+        /// </summary>
+        public string SchoolAvgScore { get; set; }
+        /// <summary>
+        /// 班级平均分
+        /// </summary>
+        public string ClassAvgScore { get; set; }
+
 
     }
 }

+ 22 - 1
TEAMModelOS.Model/Evaluation/Models/Option.cs

@@ -15,8 +15,29 @@ namespace TEAMModelOS.Model.EvaluaTion.Models
     /// </summary>
     public class Option : TableEntity
     {
-        public string Id { get; set; }
+        /// <summary>
+        /// 选项编号
+        /// </summary>
+        public string Idex { get; set; }
+        /// <summary>
+        /// 选项内容
+        /// </summary>
         public string Data { get; set; }
+        /// <summary>
+        /// 试题编号
+        /// </summary>
         public string ItemId { get; set; }
+        /// <summary>
+        /// 试卷编号
+        /// </summary>
+        public string TpId { get; set; }
+        /// <summary>
+        /// 选择次数
+        /// </summary>
+        public int OptionNum { get; set; }
+        /// <summary>
+        /// 选择率
+        /// </summary>
+        public float OptionRate { get; set; }
     }
 }

+ 150 - 4
TEAMModelOS.Service/Evaluation/Implements/ExamInfoService.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.Model.Evaluation.Dtos.Own;
+using TEAMModelOS.Model.Evaluation.Models.CosmosModels;
 using TEAMModelOS.Model.EvaluaTion.Dtos;
 using TEAMModelOS.Model.EvaluaTion.Models;
+using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
 using TEAMModelOS.Service.Core.Implements;
 using TEAMModelOS.Service.EvaluaTion.Interfaces;
 
@@ -12,28 +15,171 @@ namespace TEAMModelOS.Service.EvaluaTion.Implements
 {
     public class ExamInfoService : BaseService, IExamInfoService
     {
-        public async Task<List<ExerciseInfo>> SaveOrUpdateAsync(List<ExerciseInfo> exercises,string lang)
+
+        public IAzureCosmosDBRepository _cosmosrepository;
+        public ExamInfoService(IAzureCosmosDBRepository cosmosDBRepository)
         {
+            _cosmosrepository = cosmosDBRepository;
+        }
+
+
+        public async Task<List<MemberAnswer>> SaveOrUpdate(List<MemberAnswer> answers, string lang)
+        {
+
+            List<AnswerInfo> answerInfos = new List<AnswerInfo>();
+            if (null != answers)
+            {
+                answers.ForEach(e =>
+                {
+                    answerInfos.Add(new AnswerInfo()
+                    {
+                        RowKey = Guid.NewGuid().ToString(),
+                        PartitionKey = lang,
+                        StudentId = e.StudentId,
+                        ExNO = e.ExNO,
+                        Index = e.Itemindex,
+                        Selection = e.Selection,
+                        Point = e.Point
+                        
+
+
+                    });
+                });
+            }
+            await SaveOrUpdateAll(answerInfos);
+            return answers;
+        }
+
+        public async Task<List<ExerciseInfo>> SaveOrUpdateAsync(List<ExerciseInfo> exercises, string lang)
+        {
+
             List<ExamInfo> exams = new List<ExamInfo>();
-            if (null != exercises) {
+            if (null != exercises)
+            {
                 exercises.ForEach(e =>
                 {
                     exams.Add(new ExamInfo()
                     {
-                        RowKey =  Guid.NewGuid().ToString(),
+                        RowKey = Guid.NewGuid().ToString(),
                         PartitionKey = lang,
                         ExName = e.Ex_name,
                         ExTime = e.Ex_time,
                         CouseName = e.Course_name,
+                        SchoolName = e.SchoolName,
+                        GradeName = e.GradeName,
+                        AcademicYear = int.Parse(e.AcademicYear),
+                        SOrder = int.Parse(e.SOrder),
+                        CouseNO = e.Course_no,
+                        ClassCode = e.Class_code,
+                        ClassName = e.Class_name,
+                        QNumber = e.QNumber,
                         StuCount = e.Stucount,
                         EndTime = e.End_time,
-                        AvgScore = e.AvgScore
+                        ClassAvgScore = e.AvgScore
 
                     });
                 });
             }
             await SaveOrUpdateAll(exams);
             return exercises;
+            //throw new NotImplementedException();
+        }
+
+        public Task<List<MemberAnswer>> SaveToCosmosAnswer(List<MemberAnswer> items)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<List<ExerciseInfo>> SaveToCosmosExamAsync(List<ExerciseInfo> exercises, List<MemberAnswer> members)
+        {
+            List<Exam> exams = new List<Exam>();
+            List<Answer> answers = new List<Answer>();
+            List<CouseExam> couseExams = new List<CouseExam>();
+            List<Exam> objs = new List<Exam>();
+            List<CouseExam> couseObjs = new List<CouseExam>();
+            if (null != exercises)
+            {
+                members.ForEach(m => {
+                    answers.Add(new Answer
+                    {
+                        Id = Guid.NewGuid().ToString(),
+                        ExNO = m.ExNO,
+                        Index = m.Itemindex,
+                        Point = float.Parse(m.Point.ToString()),
+                        Detail = m.Selection,
+                        StudentId = m.StudentId
+                    });
+                });
+                exercises.ForEach(e =>
+                {
+                    string ExamNumber = e.Ex_name.Replace(" ", "").Split("_")[1];
+                    answers.ForEach(a =>
+                    {
+                        if (e.ExNO.Equals(a.ExNO) ) {
+                            //a.ExNO = e.ExNO;
+                            //a.Number = ExamNumber;
+                            a.GradeCode = e.GradeName;
+                            a.SchoolCode = e.SchoolName;
+                            a.ClassCode = e.Class_code;
+                            a.CourseCode = e.Course_name;
+                            a.ExamName = e.Ex_name.Replace(" ", "").Split("-")[0] + "-" + e.Ex_name.Replace(" ", "").Split("-")[1];
+                        }
+                    });                   
+                    exams.Add(new Exam()
+                    {
+                        Id = Guid.NewGuid().ToString(),
+                        Number = ExamNumber,
+                        Name = e.Ex_name.Replace(" ","").Split("-")[0]+ "-"+e.Ex_name.Replace(" ", "").Split("-")[1],
+                        Time = e.Ex_time
+                    });
+
+                    couseExams.Add(new CouseExam()
+                    {
+                        Id = Guid.NewGuid().ToString(),
+                        //Number = ExamNumber,
+                        ExNO = e.ExNO,
+                        ExName = e.Ex_name.Replace(" ", "").Split("-")[0] + "-" + e.Ex_name.Replace(" ", "").Split("-")[1],
+                        ExTime = e.Ex_time,
+                        AcademicYear = int.Parse(e.AcademicYear),
+                        SOrder = int.Parse(e.SOrder),
+                        Subject = e.Course_name,
+                        SchoolName = e.SchoolName
+
+                    });
+                });
+
+                
+
+                objs = exams.Where((x, i) => exams.FindIndex(z => z.Name == x.Name) == i).ToList();
+                couseObjs = couseExams.Where((x, i) => couseExams.FindIndex(z => z.ExName == x.ExName && z.Subject == x.Subject) == i).ToList();
+                objs.ForEach(f =>
+                {
+                    couseObjs.ForEach(g => {
+                        if (f.Name.Equals(g.ExName)) {
+                            g.Number = f.Number;
+                        }
+
+                    });
+                });                
+                couseObjs.ForEach(g => {
+                    answers.ForEach(x =>
+                    {
+                        if (g.Subject.Equals(x.CourseCode) && g.SchoolName.Equals(x.SchoolCode)
+                        && g.ExName.Equals(x.ExamName))
+                        {
+                            x.Number = g.Number;
+                            x.ExNO = g.ExNO;
+                        }
+                    });
+                });
+
+            }
+            await _cosmosrepository.SaveAll(objs);
+            await _cosmosrepository.SaveAll(couseObjs);
+            await _cosmosrepository.SaveAll(answers);
+
+            return exercises;
         }
+        //throw new NotImplementedException();
     }
 }

+ 5 - 0
TEAMModelOS.Service/Evaluation/Interfaces/IExamInfoService.cs

@@ -12,5 +12,10 @@ namespace TEAMModelOS.Service.EvaluaTion.Interfaces
     public interface IExamInfoService : IBusinessService, IBaseService
     {
         Task<List<ExerciseInfo>> SaveOrUpdateAsync(List<ExerciseInfo> items,string lang);
+        Task<List<MemberAnswer>> SaveOrUpdate(List<MemberAnswer> items, string lang);
+
+        Task<List<MemberAnswer>> SaveToCosmosAnswer(List<MemberAnswer> items);
+
+        Task<List<ExerciseInfo>> SaveToCosmosExamAsync(List<ExerciseInfo> items, List<MemberAnswer> answers);
     }
 }

+ 25 - 1
TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -22,20 +22,44 @@ namespace TEAMModelOS.Controllers.Analysis
         public ChangeController(IHostingEnvironment hostingEnvironment, IExamInfoService examInfoService)
         {
             _hostingEnvironment = hostingEnvironment;
+
+
             _examInfoService = examInfoService;
         }
 
+
+
         [HttpGet("SaveObject")]
         public BaseJosnRPCResponse SaveObject(string identity)
 
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "IES/exercise";
+            string identity_1 = "IES/answerinfo";
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
+            string data_1 = FileTool.getJson(contentRootPath, identity_1);
             data = FileTool.UnicodeToString(data);
+            data_1 = FileTool.UnicodeToString(data_1);
             List<ExerciseInfo> obj = MessagePackHelper.JsonToObject<List<ExerciseInfo>>(data);
-            _examInfoService.SaveOrUpdateAsync(obj,"cn");
+            List<MemberAnswer> obj_1 = MessagePackHelper.JsonToObject<List<MemberAnswer>>(data_1);
+            // _examInfoService.SaveOrUpdateAsync(obj,"cn");
+            _examInfoService.SaveToCosmosExamAsync(obj, obj_1);
+            return builder.Data(obj).build();
+            //return builder.build();
+        }
+
+        [HttpGet("SaveObjectAnswerinfo")]
+        public BaseJosnRPCResponse SaveObjectAnswerinfo(string identity)
+
+        {
+            string contentRootPath = _hostingEnvironment.ContentRootPath;
+            identity = "IES/answerinfo";
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            string data = FileTool.getJson(contentRootPath, identity);
+            data = FileTool.UnicodeToString(data);
+            List<MemberAnswer> obj = MessagePackHelper.JsonToObject<List<MemberAnswer>>(data);
+            _examInfoService.SaveOrUpdate(obj, "cn");
             return builder.Data(obj).build();
             //return builder.build();
         }

文件差异内容过多而无法显示
+ 2 - 0
TEAMModelOS/JsonFile/Core/answerinfo.json


文件差异内容过多而无法显示
+ 32 - 88922
TEAMModelOS/JsonFile/IES/answerinfo.json


文件差异内容过多而无法显示
+ 6164 - 94
TEAMModelOS/JsonFile/IES/exercise.json


+ 5 - 1
TEAMModelOS/TEAMModelOS.csproj

@@ -37,7 +37,6 @@
     <!-- Files not to publish (note that the 'dist' subfolders are re-added below) -->
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="JsonFile\Core\" />
     <Folder Include="Models\" />
     <Folder Include="wwwroot\" />
     <Folder Include="wwwroot\dist\" />
@@ -48,6 +47,11 @@
     <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
     <ProjectReference Include="..\TEAMModelOS.Service\TEAMModelOS.Service.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Update="JsonFile\IES\answerinfo.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
 
   <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->

+ 2 - 5
TeamModelOS.OfficeDoc.Test/TeamModelOS.OfficeDoc.Test.csproj

@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TeamModelOS.OfficeDoc.Test</RootNamespace>
     <AssemblyName>TeamModelOS.OfficeDoc.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
@@ -25,6 +25,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,11 +70,7 @@
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />

+ 32 - 24
TeamModelOS.OfficeDoc.Test/Web.config

@@ -1,55 +1,63 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   有关如何配置 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。
+
+    可在 <httpRuntime> 标记上设置以下特性。
+      <system.Web>
+        <httpRuntime targetFramework="4.6.1" />
+      </system.Web>
+  -->
   <system.web>
-    <compilation debug="true" targetFramework="4.7.2" />
-    <httpRuntime targetFramework="4.7.2" />
+    <compilation debug="true" targetFramework="4.6.1"/>
+    <httpRuntime targetFramework="4.6.1"/>
   </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-11.0.0.0" newVersion="11.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=\&quot;Web\&quot; /optionInfer+" />
+      <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=\&quot;Web\&quot; /optionInfer+"/>
     </compilers>
   </system.codedom>
-</configuration>
+</configuration>