Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
layomia merged 4 commits into from
Aug 24, 2023
Merged

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0 #91006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2cac91
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
layomia Aug 23, 2023
91c0722
Fix IDE issue with ILLink.RoslynAnalyzer
layomia Aug 23, 2023
aae7643
Remove source build allowed prebuilt entry for version 4.5.0
layomia Aug 23, 2023
3b01231
Add tracking issue links
layomia Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
<UsagePattern IdentityGlob="System.Composition*/*6.*" />
<UsagePattern IdentityGlob="System.Composition*/*7.*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

<!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
-->
<MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.
<!-- Some of the analyzer dependencies used by ILLink project -->
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
</PropertyGroup>
Expand Down
11 changes: 11 additions & 0 deletions src/coreclr/tools/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
</PropertyGroup>

<!--
These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.
at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
This property is set eng/Versions.props but we override it because the current
version 4.7.0 flags several warnings that need area-owner expertise to resolve.
TODO: https://github.com/dotnet/runtime/issues/91028.
-->
<PropertyGroup>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion ...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down
4 changes: 4 additions & 0 deletions ...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

/// <summary>Gets the culture to use based on the specified options.</summary>
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)
{
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
/// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
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();
Expand Down
11 changes: 11 additions & 0 deletions src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
</PropertyGroup>

<Import Project="..\Directory.Build.props" />

<!--
These packages affect the design-time experience in VS, we update them
at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
This property is set eng/Versions.props but we override it because the current
version 4.7.0 flags several warnings that need area-owner expertise to resolve.
TODO: https://github.com/dotnet/runtime/issues/91030.
-->
<PropertyGroup>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
</PropertyGroup>
</Project>
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0#91006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

layomia
merged 4 commits into

from

Aug 24, 2023
 Merged


Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0
#91006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d2cac91

Upgrade MicrosoftCodeAnalysisVersion_LatestVS version to 4.7.0


layomia Aug 23, 2023
91c0722

Fix IDE issue with ILLink.RoslynAnalyzer


layomia Aug 23, 2023
aae7643

Remove source build allowed prebuilt entry for version 4.5.0


layomia Aug 23, 2023
3b01231

Add tracking issue links


layomia Aug 23, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@
 <UsagePattern IdentityGlob="System.Composition*/*6.*" />
 <UsagePattern IdentityGlob="System.Composition*/*7.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.4.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.5.*" />
 <UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.7.*" />

 <!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 -->
 <MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
 <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0</MicrosoftCodeAnalysisVersion_LatestVS>
Comment thread
layomia marked this conversation as resolved.

 <!-- Some of the analyzer dependencies used by ILLink project -->
 <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.5-beta1.23270.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
 </PropertyGroup>
Expand Down

11 changes: 11 additions & 0 deletions
src/coreclr/tools/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,15 @@
 <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
 <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
 </PropertyGroup>

 <!--
 These packages affect the design-time experience in VS, we update them
Comment thread
layomia marked this conversation as resolved.

 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91028.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>

2 changes: 1 addition & 1 deletion
...onfiguration.Binder/gen/Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" PrivateAssets="all" />
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" PrivateAssets="all" />
 </ItemGroup>

 <ItemGroup>
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,8 +210,10 @@ private static async Task<Document> 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");
Expand Down

4 changes: 4 additions & 0 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,9 @@ private RegexParser(string pattern, RegexOptions options, CultureInfo culture, H

 /// <summary>Gets the culture to use based on the specified options.</summary>
 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)
 {
Expand DownExpand Up@@ -134,7 +136,9 @@ public static RegexTree Parse(string pattern, RegexOptions options, CultureInfo
 /// <summary>This static call constructs a flat concatenation node given a replacement pattern.</summary>
 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();
Expand Down

11 changes: 11 additions & 0 deletions
src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,4 +5,15 @@
 </PropertyGroup>

 <Import Project="..\Directory.Build.props" />

 <!--
 These packages affect the design-time experience in VS, we update them
 at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
 This property is set eng/Versions.props but we override it because the current
 version 4.7.0 flags several warnings that need area-owner expertise to resolve.
 TODO: https://github.com/dotnet/runtime/issues/91030.
 -->
 <PropertyGroup>
 <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
 </PropertyGroup>
</Project>