lu
4 天以前 8d16f3028d7a8ac411141cbdc44b8da66f278a34
版本降级
已修改6个文件
已删除6个文件
11633 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.Designer.cs 190 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs 311 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.Designer.cs 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs 326 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/packages.config 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.Setup/Gs.Setup.vdproj 10315 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/GsDevSolution.sln 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -7,7 +7,6 @@
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
      <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    </sectionGroup>
    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
  </configSections>
  <applicationSettings>
    <DevExpress.LookAndFeel.Design.AppSettings>
@@ -43,9 +42,8 @@
    <add key="ProductName" value="G-MES V2.0" />
    <add key="PageSize" value="50" />
    <add key="Version" value="0.1" />
    <add key="IsAutoUpdater" value="0" />
    <add key="IsAutoUpdater" value="1" />
    <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
    <add key="ClientSettingsProvider.ServiceUri" value="" />
  </appSettings>
  <userSettings>
    <Gs.DevApp.Properties.Settings>
@@ -78,10 +76,4 @@
      </providers>
    </roleManager>
  </system.web>
  <system.data>
    <DbProviderFactories>
      <remove invariant="Oracle.ManagedDataAccess.Client" />
      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
    </DbProviderFactories>
  </system.data>
</configuration>
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
@@ -1,15 +1,12 @@
锘縰sing DevExpress.RichEdit.Export;
using Gs.DevApp.Entity;
锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using OracleInternal.Sharding;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using static DevExpress.XtraBars.Docking2010.Views.BaseRegistrator;
namespace Gs.DevApp.DevFrm.WOM
{
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -121,9 +121,6 @@
    <Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
    </Reference>
    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
      <HintPath>..\packages\Oracle.ManagedDataAccess.23.6.0\lib\net472\Oracle.ManagedDataAccess.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="System" />
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.Designer.cs
文件已删除
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs
文件已删除
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.resx
文件已删除
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.Designer.cs
文件已删除
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs
文件已删除
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.resx
文件已删除
DevApp/Gs.DevApp/packages.config
@@ -9,7 +9,6 @@
  <package id="Microsoft.Web.WebView2" version="1.0.2592.51" targetFramework="net48" />
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
  <package id="NModbus" version="3.0.81" targetFramework="net48" />
  <package id="Oracle.ManagedDataAccess" version="23.6.0" targetFramework="net48" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
  <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net48" />
  <package id="System.Diagnostics.DiagnosticSource" version="6.0.1" targetFramework="net48" />
DevApp/Gs.Setup/Gs.Setup.vdproj
文件太大
DevApp/GsDevSolution.sln
@@ -5,7 +5,7 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.DevApp", "Gs.DevApp\Gs.DevApp.csproj", "{A7EB5F78-699E-4514-8905-30842765E673}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.ChengZhong", "Gs.ChengZhong\Gs.ChengZhong.csproj", "{15B9946D-494B-4A5C-B37C-84519A05408A}"
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Gs.Setup", "Gs.Setup\Gs.Setup.vdproj", "{F3C81646-6D3A-F3FA-71B8-C96D2224C585}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@
        {A7EB5F78-699E-4514-8905-30842765E673}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.Build.0 = Release|Any CPU
        {15B9946D-494B-4A5C-B37C-84519A05408A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {15B9946D-494B-4A5C-B37C-84519A05408A}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {15B9946D-494B-4A5C-B37C-84519A05408A}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {15B9946D-494B-4A5C-B37C-84519A05408A}.Release|Any CPU.Build.0 = Release|Any CPU
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Debug|Any CPU.ActiveCfg = Debug
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Debug|Any CPU.Build.0 = Debug
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Release|Any CPU.ActiveCfg = Release
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Release|Any CPU.Build.0 = Release
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE