diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 46dd7457d764aa..71324a489ab944 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -9,7 +9,6 @@ - diff --git a/eng/Versions.props b/eng/Versions.props index 335b628baa5b2a..eacb1421d65536 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ Source-build builds the product with the most recent previously source-built release. Thankfully, these two requirements line up nicely such that any version that satisfies the VS version requirement will also satisfy the .NET SDK version requirement because of how we ship. --> - 4.5.0 + 4.7.0 3.3.5-beta1.23270.2 diff --git a/src/coreclr/tools/Directory.Build.props b/src/coreclr/tools/Directory.Build.props index 4b443b53152bbe..6386652c7af513 100644 --- a/src/coreclr/tools/Directory.Build.props +++ b/src/coreclr/tools/Directory.Build.props @@ -12,4 +12,15 @@ true DEBUG;$(DefineConstants) + + + + 4.5.0 + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj index e895d18c5556c6..508bcf57947706 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs b/src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs index fd5bfa8d64daf4..e63770a0a94d56 100644 --- a/src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs +++ b/src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs @@ -210,8 +210,10 @@ private static async Task ConvertToSourceGenerator(Document document, // it in as a parameter. If the user specified IgnoreCase, but also selected CultureInvariant, then we skip as the default is to use Invariant culture. if ((regexOptions & RegexOptions.IgnoreCase) != 0 && (regexOptions & RegexOptions.CultureInvariant) == 0) { +#pragma warning disable RS1035 // The symbol 'CultureInfo.CurrentCulture' is banned for use by analyzers. // If CultureInvariant wasn't specified as options, we default to the current culture. cultureNameValue = generator.LiteralExpression(CultureInfo.CurrentCulture.Name); +#pragma warning restore RS1035 // If options weren't passed in, then we need to define it as well in order to use the three parameter constructor. regexOptionsValue ??= generator.MemberAccessExpression(SyntaxFactory.IdentifierName("RegexOptions"), "None"); diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs index 1cc517713121c9..5c5ca0e209d0c9 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs +++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs @@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H /// Gets the culture to use based on the specified options. internal static CultureInfo GetTargetCulture(RegexOptions options) => +#pragma warning disable RS1035 // The symbol 'CultureInfo.CurrentCulture' is banned for use by analyzers. (options & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture; +#pragma warning restore RS1035 public static RegexOptions ParseOptionsInPattern(string pattern, RegexOptions options) { @@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo /// This static call constructs a flat concatenation node given a replacement pattern. public static RegexReplacement ParseReplacement(string pattern, RegexOptions options, Hashtable caps, int capsize, Hashtable capnames) { +#pragma warning disable RS1035 // The symbol 'CultureInfo.CurrentCulture' is banned for use by analyzers. CultureInfo culture = (options & RegexOptions.CultureInvariant) != 0 ? CultureInfo.InvariantCulture : CultureInfo.CurrentCulture; +#pragma warning restore RS1035 using var parser = new RegexParser(pattern, options, culture, caps, capsize, capnames, stackalloc int[OptionStackDefaultSize]); RegexNode root = parser.ScanReplacement(); diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props b/src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props index ca4ac67cf2f699..6aa8cd932f1103 100644 --- a/src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props +++ b/src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props @@ -5,4 +5,15 @@ + + + + 4.5.0 +