Skip to content

Commit 78dc0b0

Browse files
cpsusiecpsusie
authored
Merge pull request #9 from cpsusie/v0.2.5.x_issue_8
V0.2.5.x issue 8 FIXED
2 parents 8d797bc + f27be24 commit 78dc0b0

24 files changed

+458
-46
lines changed

‎CafeBabeGame/CafeBabeGame/CafeBabeGame.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="DotNetVault" Version="0.2.5.8" />
16+
<PackageReference Include="DotNetVault" Version="0.2.5.9" />
1717
<PackageReference Include="HighPrecisionTimeStamps" Version="0.1.0" />
1818
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
1919
</ItemGroup>

‎Clorton Game/ClortonGameDemo/ClortonGameDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="DotNetVault" Version="0.2.5.8" />
16+
<PackageReference Include="DotNetVault" Version="0.2.5.9" />
1717
<PackageReference Include="HighPrecisionTimeStamps" Version="0.1.0" />
1818
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
1919
</ItemGroup>

‎ConsoleStressTest/ConsoleStressTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="DotNetVault" Version="0.2.5.7-alpha" />
20+
<PackageReference Include="DotNetVault" Version="0.2.5.9" />
2121
<PackageReference Include="HighPrecisionTimeStamps" Version="0.1.0" />
2222
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
2323
</ItemGroup>

‎DotNetVault Description.docx ‎DotNetVault Description latest.docx

650 KB
Binary file not shown.

‎DotNetVault Description.pdf

96.7 KB
Binary file not shown.

‎DotNetVault.Test/AnalyzerYetAgainUnitTests.cs

+14
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,20 @@ public void AnalyzerNotHeldAgainstUnitTests()
584584
VerifyCSharpDiagnostic(test);
585585
}
586586

587+
[TestMethod]
588+
public void NullableEnumNotHeldAgainstTest_1()
589+
{
590+
var test = ResourceFiles.Issue8TestCases.Issue8_TestCases;
591+
VerifyCSharpDiagnostic(test);
592+
}
593+
594+
[TestMethod]
595+
public void ReadOnlyUnmanagedFieldWithWritableMembersOk()
596+
{
597+
var test = ResourceFiles.Issue8TestCases.Issue8TestCase2Similar;
598+
VerifyCSharpDiagnostic(test);
599+
}
600+
587601
[TestMethod]
588602
public void EventArgsOkTest()
589603
{

‎DotNetVault.Test/DotNetVault.Test.csproj

+11
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
<Compile Remove="TestCases\ImmutableCollectionIsVaultSafe.cs" />
5252
<Compile Remove="TestCases\ImmutableStructIsVaultSafe.cs" />
5353
<Compile Remove="TestCases\ImmutableStructIsVsUnmanaged.cs" />
54+
<Compile Remove="TestCases\Issue8TestCase2Similar.cs" />
55+
<Compile Remove="TestCases\Issue8_TestCases.cs" />
5456
<Compile Remove="TestCases\MethodInvokeSyntaxTests.cs" />
5557
<Compile Remove="TestCases\MethodInvokeSyntaxTests_2.cs" />
5658
<Compile Remove="TestCases\NdiMixedWithNotInlineNotOkCaseThree.cs" />
@@ -142,6 +144,11 @@
142144
<AutoGen>True</AutoGen>
143145
<DependentUpon>EarlyReleaseTestCases.resx</DependentUpon>
144146
</Compile>
147+
<Compile Update="ResourceFiles\Issue8TestCases.Designer.cs">
148+
<DesignTime>True</DesignTime>
149+
<AutoGen>True</AutoGen>
150+
<DependentUpon>Issue8TestCases.resx</DependentUpon>
151+
</Compile>
145152
<Compile Update="ResourceFiles\NdiTestCases.Designer.cs">
146153
<DesignTime>True</DesignTime>
147154
<AutoGen>True</AutoGen>
@@ -233,6 +240,10 @@
233240
<Generator>ResXFileCodeGenerator</Generator>
234241
<LastGenOutput>EarlyReleaseTestCases.Designer.cs</LastGenOutput>
235242
</EmbeddedResource>
243+
<EmbeddedResource Update="ResourceFiles\Issue8TestCases.resx">
244+
<Generator>ResXFileCodeGenerator</Generator>
245+
<LastGenOutput>Issue8TestCases.Designer.cs</LastGenOutput>
246+
</EmbeddedResource>
236247
<EmbeddedResource Update="ResourceFiles\NdiTestCases.resx">
237248
<Generator>ResXFileCodeGenerator</Generator>
238249
<LastGenOutput>NdiTestCases.Designer.cs</LastGenOutput>

‎DotNetVault.Test/ResourceFiles/Issue8TestCases.Designer.cs

+129
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DotNetVault.Test/ResourceFiles/Issue8TestCases.resx

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="Issue8TestCase2Similar" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\testcases\issue8testcase2similar.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
123+
</data>
124+
<data name="Issue8_TestCases" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\TestCases\Issue8_TestCases.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
126+
</data>
127+
</root>

‎DotNetVault.Test/TestCases/Issue8TestCase2Similar.cs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
using DotNetVault.Attributes;
5+
6+
namespace DotNetVault.Test.TestCases
7+
{
8+
[VaultSafe]
9+
struct Issue8TestCase2Similar
10+
{
11+
public int X;
12+
public int Y;
13+
public int Z;
14+
15+
public Issue8TestCase2Similar(int x, int y, int z)
16+
{
17+
X = x;
18+
Y = y;
19+
Z = z;
20+
}
21+
}
22+
23+
[VaultSafe]
24+
public sealed class TestMe
25+
{
26+
public TestMe(int x, int y, int z) => _value = new Issue8TestCase2Similar(x, y, z);
27+
28+
public override string ToString() =>
29+
$"[{nameof(TestMe)}] -- X: [{_value.X}]; Y: [{_value.Y}]; Z: [{_value.Z}].";
30+
31+
private readonly Issue8TestCase2Similar _value;
32+
}
33+
}

0 commit comments

Comments
 (0)