Skip to content

Commit

Permalink
Workaround roslyn compiler issue caused by BuildTools update
Browse files Browse the repository at this point in the history
The source file changes are to remove some non unicode characters in
files that were tripping Roslyn up.
  • Loading branch information
weshaggard committed Jul 11, 2017
1 parent ebdf2e6 commit f4be9e1
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static void Test(string constr, string srctable, string dstTable)
Helpers.Execute(dstCmd, "create table " + srctable + " (col1 int , col2 int, col3 text)");
Helpers.Execute(dstCmd, "insert into " + srctable + " values (33, 498, 'Michael')");
Helpers.Execute(dstCmd, "insert into " + srctable + " values (34, 499, 'Astrid')");
Helpers.Execute(dstCmd, "insert into " + srctable + " values (65, 500, 'alles Käse')");
Helpers.Execute(dstCmd, "insert into " + srctable + " values (65, 500, 'alles Käse')");

Helpers.Execute(dstCmd, "create table " + dstTable + " (col1 int primary key, col2 int CONSTRAINT CK_" + dstTable + " CHECK (col2 < 500), col3 text)");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static void Test(string constr, string dstTable)
"insert into " + dstTable + "_src values (10, convert(uniqueidentifier, '00000000-0000-0000-0000-000000000009') )",
"insert into " + dstTable + "_src values (11, convert(varbinary(756), 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0A) )",
"insert into " + dstTable + "_src values (12, convert(varchar(756), '111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101') )",
"insert into " + dstTable + "_src values (13, convert(nvarchar(756), N'???a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a?????') )",
"insert into " + dstTable + "_src values (13, convert(nvarchar(756), N'???a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a?????') )",
"insert into " + dstTable + "_src values (14, convert(datetime, {ts '2003-01-11 12:54:01.133'}) )",
"insert into " + dstTable + "_src values (15, convert(bigint, 444444444444404) )",
"insert into " + dstTable + "_src values (16, convert(int, -555505) )",
Expand Down Expand Up @@ -76,4 +76,4 @@ public static void Test(string constr, string dstTable)
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ internal sealed class HttpListenerRequestUriBuilder
//
// When parsing ANSI (Latin 1) encoded path '/pa%C4th/', %C4 will be added to rawOctets and when
// we reach 't', the content of rawOctets { 0xC4 } will be fed into the ANSI encoding. The resulting
// string 'Ä' will be percent encoded into UTF-8 octets and appended to requestUriString. The final
// path will be '/pa%C3%84th/', where '%C3%84' is the UTF-8 percent encoded character 'Ä'.
// string 'Ä' will be percent encoded into UTF-8 octets and appended to requestUriString. The final
// path will be '/pa%C3%84th/', where '%C3%84' is the UTF-8 percent encoded character 'Ä'.
private List<byte> _rawOctets;
private string _rawPath;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private void WriteDateTimeInDefaultFormat(DateTime value)
// Fetching the UtcOffset is expensive so we need to avoid it if possible. We can do a fast
// bounds check to decide if the more expensive bounds check is needed. The result from
// TimeZoneInfo.Local.GetUtcOffset(value) is bounded to +/- 24 hours. If
// (DateTime.MinValue + 24 hours) < value < (DateTime.MaxValue 24 hours), then we don't need
// (DateTime.MinValue + 24 hours) < value < (DateTime.MaxValue - 24 hours), then we don't need
// to check using the real UtcOffset as it doesn't matter what the offset is, it can't cause
// an overflow/underflow condition.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public XsltcTestFile(ITestOutputHelper output) : base(output)
[InlineData("@infft14.txt", "fft14.dll", "no", "fft14", "fft14.pdb", "no", "fft14.txt")]
//[Variation("15", Desc = "Test multiple config files with circular reference and case sensitive file names specified", Pri = 1, Params = new object[] { "@infft15.txt", "fft15.dll", "no", "fft15", "fft15.pdb", "no", "fft15.txt" })]
//[InlineData("@infft15.txt", "fft15.dll", "no", "fft15", "fft15.pdb", "no", "fft15.txt")] //Skipping this, it tries to load System.dll
//[Variation("17", Desc = "Exercise comments(‘#’) within file", Pri = 1, Params = new object[] { "@infft17.txt", "fft17.dll", "yes", "fft17", "fft17.pdb", "no", "fft17.txt" })]
//[Variation("17", Desc = "Exercise comments(‘#’) within file", Pri = 1, Params = new object[] { "@infft17.txt", "fft17.dll", "yes", "fft17", "fft17.pdb", "no", "fft17.txt" })]
//[InlineData("@infft17.txt", "fft17.dll", "yes", "fft17", "fft17.pdb", "no", "fft17.txt")] //Skipping this, it tries to load System.dll
//[Variation("18", Desc = "When loading from a file exercise commands and filenames with ‘#” in them", Pri = 1, Params = new object[] { "@infft18.txt", "fft18.dll", "yes", "AB#CD", "fft18.pdb", "no", "fft18.txt" })]
//[Variation("18", Desc = "When loading from a file exercise commands and filenames with ‘#” in them", Pri = 1, Params = new object[] { "@infft18.txt", "fft18.dll", "yes", "AB#CD", "fft18.pdb", "no", "fft18.txt" })]
//[InlineData("@infft18.txt", "fft18.dll", "yes", "AB#CD", "fft18.pdb", "no", "fft18.txt")] //Skipping this, it tries to load System.dll
//[Variation("19", Desc = "Exercise wildcards with @", Pri = 1, Params = new object[] { "@*.txt", "fft19.dll", "no", "fft19", "fft19.pdb", "no", "fft19.txt", "EnglishOnly" })]
[InlineData("@*.txt", "fft19.dll", "no", "fft19", "fft19.pdb", "no", "fft19.txt"/*, "EnglishOnly"*/)]
Expand All @@ -73,4 +73,4 @@ public void Var1(object param0, object param1, object param2, object param3, obj
VerifyTest(cmdLine, asmName, asmCreated, typeName, pdbName, pdbCreated, baselineFile, _createFromInputFile);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ internal static byte GetUserStringTrailingByte(string str)
// ECMA-335 II.24.2.4:
// This final byte holds the value 1 if and only if any UTF16 character within
// the string has any bit set in its top byte, or its low byte is any of the following:
// 0x01–0x08, 0x0E–0x1F, 0x27, 0x2D, 0x7F. Otherwise, it holds 0.
// 0x01-0x08, 0x0E-0x1F, 0x27, 0x2D, 0x7F. Otherwise, it holds 0.
// The 1 signifies Unicode characters that require handling beyond that normally provided for 8-bit encoding sets.

foreach (char ch in str)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public override int BlockSize
if (value == 192 || value == 256)
throw new PlatformNotSupportedException(SR.Cryptography_Rijndael_BlockSize);

// Any other invalid block size will get the normal invalid block size exception.
// Any other invalid block size will get the normal "invalid block size" exception.
_impl.BlockSize = value;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public override int BlockSize
if (value == 192 || value == 256)
throw new PlatformNotSupportedException(SR.Cryptography_Rijndael_BlockSize);

// Any other invalid block size will get the normal invalid block size exception.
// Any other invalid block size will get the normal "invalid block size" exception.
_impl.BlockSize = value;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal static IEnumerable<EccTestData> EnumerateApplicableTests()
CurveOid = Secp256r1OidValue,
CurveEncodedOidHex = Secp256r1OidHexValue,

// Suite B Implementers Guide to FIPS 186-3,
// Suite B Implementer’s Guide to FIPS 186-3,
// D.1 Example ECDSA Signature for P-256
KeyParameters = new ECParameters
{
Expand All @@ -67,7 +67,7 @@ internal static IEnumerable<EccTestData> EnumerateApplicableTests()
CurveOid = Secp384r1OidValue,
CurveEncodedOidHex = Secp384r1OidHexValue,

// Suite B Implementers Guide to FIPS 186-3,
// Suite B Implementer’s Guide to FIPS 186-3,
// D.2 Example ECDSA Signature for P-384
KeyParameters = new ECParameters
{
Expand Down

0 comments on commit f4be9e1

Please sign in to comment.