diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66b1c212ab7..d46cfb50e41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,87 +10,87 @@ --> - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://github.com/dotnet/core-setup - 9f7ab48ba6c2c910a48d0b484f103e274d3654fc + 08e144c8651632da7bf1fbab409d27787ce6aa4a - + https://github.com/dotnet/core-setup - 9f7ab48ba6c2c910a48d0b484f103e274d3654fc + 08e144c8651632da7bf1fbab409d27787ce6aa4a - + https://github.com/dotnet/core-setup - 9f7ab48ba6c2c910a48d0b484f103e274d3654fc + 08e144c8651632da7bf1fbab409d27787ce6aa4a - + https://github.com/dotnet/arcade - aa4285be7fab64e2b6e62e4d5688ea50931c407c + 9946534da4f73e6242ca105f6798ab58119c9ab0 - + https://github.com/dotnet/arcade - aa4285be7fab64e2b6e62e4d5688ea50931c407c + 9946534da4f73e6242ca105f6798ab58119c9ab0 - + https://github.com/dotnet/arcade - aa4285be7fab64e2b6e62e4d5688ea50931c407c + 9946534da4f73e6242ca105f6798ab58119c9ab0 - + https://github.com/dotnet/corefx - edc88b0fe55278ee43c821ab05707d8bb0befded + 468355e66daf9eaeb1978703fa6365cd1e37e644 diff --git a/eng/Versions.props b/eng/Versions.props index 24b1013d927..cc10ebf22db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,26 +44,26 @@ --> - 3.0.0-preview7-27819-08 - 3.0.0-preview7-27819-08 - 2.1.0-preview7-27819-08 + 3.0.0-preview7-27823-05 + 3.0.0-preview7-27823-05 + 2.1.0-preview7-27823-05 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 1.7.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 - 4.6.0-preview7.19319.4 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 1.7.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 - 3.0.0-preview7.19319.4 + 3.0.0-preview7.19320.1 - 1.0.0-beta.19315.2 + 1.0.0-beta.19323.4 System.Exception: inner oops") }, +#else { "E5JS", (e) => VerifySingleEvent(e, "Logger2", EventTypes.MessageJson, 5, null, LogLevel.Critical, @"""ArgumentsJson"":{""stringParam"":""bar"",""int1Param"":""23"",""int2Param"":""45""", @"""ExceptionJson"":{""TypeName"":""System.Exception"",""Message"":""oops"",""HResult"":""-2146233088"",""VerboseMessage"":""System.Exception: oops ---\u003e System.Exception: inner oops") }, @@ -699,6 +711,7 @@ private static class EventTypes @"{""Key"":""int1Param"",""Value"":""23""}", @"{""Key"":""int2Param"",""Value"":""45""}", @"""Exception"":{""TypeName"":""System.Exception"",""Message"":""oops"",""HResult"":-2146233088,""VerboseMessage"":""System.Exception: oops ---> System.Exception: inner oops") }, +#endif { "E6FM", (e) => VerifySingleEvent(e, "Logger2", EventTypes.FormattedMessage, 6, null, LogLevel.Warning, @"""FormattedMessage"":""Logger2 Event6 Warning NoParams""") }, @@ -757,5 +770,10 @@ static string GetEscapedForwardSlash(string input) return output; } + + static string EscapedNewline() + { + return Environment.NewLine.Replace("\r", "\\r").Replace("\n", "\\n"); + } } }