Skip to content

Commit b657f16

Browse files
committed
Fixed Bug from release #2
1 parent 265cf8e commit b657f16

File tree

9 files changed

+62
-53
lines changed

9 files changed

+62
-53
lines changed

DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
<ProjectReference Include="..\DataEditor.FuzzyData.Extra\DataEditor.FuzzyData.Extra.csproj">
128128
<Project>{3332a025-6e2b-4d9f-8a46-9f2350b39750}</Project>
129129
<Name>DataEditor.FuzzyData.Extra</Name>
130+
<Private>False</Private>
130131
</ProjectReference>
131132
<ProjectReference Include="..\DataEditor.FuzzyData\DataEditor.FuzzyData.csproj">
132133
<Project>{3516d3c7-f112-4763-9f2d-0b17991c12ff}</Project>

DataEditor.Control/DataEditor.Control.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="DataEditor.FuzzyData">
34-
<HintPath>..\..\DataEditor\DataEditor.FuzzyData\bin\Debug\DataEditor.FuzzyData.dll</HintPath>
35-
</Reference>
3633
<Reference Include="System" />
3734
<Reference Include="System.Data" />
3835
<Reference Include="System.Drawing" />
@@ -61,6 +58,10 @@
6158
<Project>{d7dfc2b5-bb85-4037-b052-c4f1e3c1bde0}</Project>
6259
<Name>DataEditor.Contract</Name>
6360
</ProjectReference>
61+
<ProjectReference Include="..\DataEditor.FuzzyData\DataEditor.FuzzyData.csproj">
62+
<Project>{3516d3c7-f112-4763-9f2d-0b17991c12ff}</Project>
63+
<Name>DataEditor.FuzzyData</Name>
64+
</ProjectReference>
6465
<ProjectReference Include="..\DataEditor.Help\DataEditor.Help.csproj">
6566
<Project>{aafc4019-7092-4e66-9f1d-8a3ea4ba75a0}</Project>
6667
<Name>DataEditor.Help</Name>

DataEditor.Control/WrapBaseEditor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public virtual FuzzyData.FuzzyObject Parent
9393
FuzzyData.FuzzyObject origin = GetValueFromChild(value);
9494
TValue ans = ConvertToValue(origin);
9595
if (ans == null)
96+
//this.value = parent;
9697
EnableData = SetDefault() ? DataState.Disable : DataState.Default;
9798
else
9899
{

DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData
4848
E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.csprojResolveAssemblyReference.cache
4949
E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.dll
5050
E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.pdb
51+
E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData.dll
52+
E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData.pdb

DataEditor.Help/DataEditor.Help.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="DataEditor.FuzzyData">
35-
<HintPath>..\..\DataEditor\DataEditor.FuzzyData\bin\Debug\DataEditor.FuzzyData.dll</HintPath>
36-
</Reference>
3734
<Reference Include="System" />
3835
<Reference Include="System.Data" />
3936
<Reference Include="System.Drawing" />
@@ -85,6 +82,10 @@
8582
<Project>{a9c0dc50-cec6-401b-92e3-65787c9bedc9}</Project>
8683
<Name>DataEditor.FuzzyData.Serialization.RubyMarshal</Name>
8784
</ProjectReference>
85+
<ProjectReference Include="..\DataEditor.FuzzyData\DataEditor.FuzzyData.csproj">
86+
<Project>{3516d3c7-f112-4763-9f2d-0b17991c12ff}</Project>
87+
<Name>DataEditor.FuzzyData</Name>
88+
</ProjectReference>
8889
</ItemGroup>
8990
<ItemGroup>
9091
<EmbeddedResource Include="OutLink\LoadingForm.resx">

DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Control.Wind
5050
E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.csproj.GenerateResource.Cache
5151
E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.dll
5252
E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.pdb
53+
E:\VS Projects\DataEditor.Ruby\DataEditor.Help\bin\Debug\DataEditor.FuzzyData.dll
54+
E:\VS Projects\DataEditor.Ruby\DataEditor.Help\bin\Debug\DataEditor.FuzzyData.pdb

DataEditor.Ruby/DataEditor.Ruby.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<HintPath>W:\IronRuby 1.0v4\bin\Microsoft.Scripting.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Scripting.Debugging">
62-
<HintPath>W:\IronRuby 1.0v4\bin\Microsoft.Scripting.Debugging.dll</HintPath>
62+
<HintPath>..\..\..\IronRuby 1.0v4\bin\Microsoft.Scripting.Debugging.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System" />
6565
<Reference Include="System.Core" />

DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.Control.pdb
8585
E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.Help.pdb
8686
E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.FuzzyData.Serialization.RubyMarshal.pdb
8787
E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\obj\Debug\DataEditor.Ruby.dll
88+
E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\Microsoft.Scripting.Debugging.dll

0 commit comments

Comments
 (0)