From f159d7765cbb43eb3fa737bed43d92085afd762e Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Wed, 25 Nov 2015 08:36:13 -0500
Subject: [PATCH] removing conditional; unnecessary now that missing RESX file
 has been properly added

---
 .../Support/ResourceSetMessageSourceTests.cs  | 15 +------
 .../Spring.Context.Tests.sr-Cyrl-RS.resx      | 45 +++++++++++++++++++
 .../Spring.Core.Tests.2010.csproj             |  3 ++
 3 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-RS.resx

diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
index 7d68f5e0..c820a9b3 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
@@ -275,21 +275,10 @@ namespace Spring.Context.Support
                                 msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianLatinCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
 
 
-                if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)
-                {
-                    Assert.AreEqual("Ovo je Spring.NET",
+                Assert.AreEqual("Ово је Spring.NET",
                                 msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
                                                          new object[] { "Spring", ".NET" }), "message not as expected");
-
-                }
-                else
-                {
-                    Assert.AreEqual("Ово је Spring.NET",
-                                msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
-                                                         new object[] { "Spring", ".NET" }), "message not as expected");
-                }
-
-
+                
                 Assert.AreEqual("Visual Studio voli Spring.NET",
                                 msgSource.GetMessage("MyNewMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
 
diff --git a/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-RS.resx b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-RS.resx
new file mode 100644
index 00000000..444f4280
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-RS.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MyMessage">
+    <value>Ово је {0}{1}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
index 7575e181..7876b999 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
@@ -955,6 +955,9 @@
     <Content Include="Spring.Core.Tests.dll.config" />
     <EmbeddedResource Include="Resources\Spring.Context.Tests.de-AT.resx" />
     <EmbeddedResource Include="Resources\Spring.Context.Tests.de.resx" />
+    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr-Cyrl-RS.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Tesla.sr-Cyrl-RS.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>