Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/roslyn (#28520)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/roslyn


 - Suppress false positives. Updating analyzers is tracked by #28672.
  • Loading branch information
dotnet-maestro[bot] authored Oct 20, 2022
1 parent da97cb3 commit 3a31c64
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 21 deletions.
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,34 +64,34 @@
<Sha>bee17d238280246c6a8e6decbd86a91fda6d00c6</Sha>
<SourceBuildTarball RepoName="format" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.4.0-3.22511.14">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.5.0-1.22519.12">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>a9c49e8b8633005d2d03516693950037a9cf7cc7</Sha>
<Sha>50b404de631906144f43261fa1abeae8f40b75ef</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.0-alpha.1.22519.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.4.0-3.22511.14</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.4.0-3.22511.14</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.4.0-3.22511.14</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.4.0-3.22511.14</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.4.0-3.22511.14</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.4.0-3.22511.14</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.4.0-3.22511.14</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.5.0-1.22519.12</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.5.0-1.22519.12</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.5.0-1.22519.12</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.5.0-1.22519.12</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.5.0-1.22519.12</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.5.0-1.22519.12</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.5.0-1.22519.12</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,9 @@ public static IEnumerable<object[]> GetInvalidParametersTestData()
}

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(GetInvalidParametersTestData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
// invalid params:
// [0] name / value - Kind
// [1] canonical
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public void Create_CanParseTemplateWithOptions()
}

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanEvaluateTemplateToRunData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void Create_CanEvaluateTemplateToRun(string command, string templateSet, string? defaultLanguage, string? expectedIdentitiesStr)
{
TemplateGroup templateGroup = TemplateGroup.FromTemplateList(
Expand Down Expand Up @@ -124,7 +126,9 @@ internal void Create_CanValidateOptionUsage_InNewCommand(string command, string?
}

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanParseTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void Create_CanParseTemplateOptions(string command, string parameterName, string parameterType, string? defaultValue, string? defaultIfNoOptionValue, string? expectedValue)
{
//unique case for dotnet new create
Expand Down Expand Up @@ -165,7 +169,9 @@ internal void Create_CanParseTemplateOptions(string command, string parameterNam
}

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanParseChoiceTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void Create_CanParseChoiceTemplateOptions(string command, string parameterName, string parameterValues, string? defaultIfNoOptionValue, string? expectedValue)
{
MockTemplateInfo template = new MockTemplateInfo("foo", identity: "foo.1", groupIdentity: "foo.group")
Expand Down Expand Up @@ -200,7 +206,9 @@ internal void Create_CanParseChoiceTemplateOptions(string command, string parame
}

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanDetectParseErrorsTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void Create_CanDetectParseErrorsTemplateOptions(
string command,
string parameterName,
Expand Down Expand Up @@ -234,7 +242,9 @@ internal void Create_CanDetectParseErrorsTemplateOptions(
}

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanDetectParseErrorsChoiceTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void Create_CanDetectParseErrorsChoiceTemplateOptions(
string command,
string parameterName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ public void Instantiate_CanParseTemplateWithOptions()
};

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanEvaluateTemplateToRunData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void CanEvaluateTemplateToRun(string command, string templateSet, string? defaultLanguage, string? expectedIdentitiesStr)
{
TemplateGroup templateGroup = TemplateGroup.FromTemplateList(
Expand Down Expand Up @@ -304,7 +306,9 @@ internal void CanParseNameOption(string command, string? expectedValue)
};

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanParseTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void CanParseTemplateOptions(string command, string parameterName, string parameterType, string? defaultValue, string? defaultIfNoOptionValue, string? expectedValue)
{
MockTemplateInfo template = new MockTemplateInfo("foo", identity: "foo.1", groupIdentity: "foo.group")
Expand Down Expand Up @@ -348,7 +352,9 @@ internal void CanParseTemplateOptions(string command, string parameterName, stri
};

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanParseChoiceTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void CanParseChoiceTemplateOptions(string command, string parameterName, string parameterValues, string? defaultIfNoOptionValue, string? expectedValue)
{
MockTemplateInfo template = new MockTemplateInfo("foo", identity: "foo.1", groupIdentity: "foo.group")
Expand Down Expand Up @@ -392,7 +398,9 @@ internal void CanParseChoiceTemplateOptions(string command, string parameterName
};

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanParseMultiChoiceTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void CanParseMultiChoiceTemplateOptions(string command, string parameterName, string parameterValues, string? defaultIfNoOptionValue, string? expectedValue)
{
MockTemplateInfo template = new MockTemplateInfo("foo", identity: "foo.1", groupIdentity: "foo.group")
Expand Down Expand Up @@ -455,7 +463,9 @@ internal void CanParseMultiChoiceTemplateOptions(string command, string paramete
};

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanDetectParseErrorsTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void CanDetectParseErrorsTemplateOptions(
string command,
string parameterName,
Expand Down Expand Up @@ -498,7 +508,9 @@ internal void CanDetectParseErrorsTemplateOptions(
};

[Theory]
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(CanDetectParseErrorsChoiceTemplateOptionsData))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
internal void CanDetectParseErrorsChoiceTemplateOptions(
string command,
string parameterName,
Expand Down
8 changes: 8 additions & 0 deletions src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,9 @@ public void NuGetConfigPermissions()

[Theory]
//creates all possible combinations for supported templates, language versions and frameworks
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(TopLevelProgramSupport_Data))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
public void TopLevelProgramSupport(string name, bool buildPass, string? framework, string? langVersion, bool supportsFeature)
{
string workingDir = CreateTemporaryFolder(folderName: $"{name}-{langVersion ?? "null"}-{framework ?? "null"}");
Expand Down Expand Up @@ -582,7 +584,9 @@ static void Main(string[] args)

[Theory]
//creates all possible combinations for supported templates, language versions and frameworks
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(NullableSupport_Data))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
public void NullableSupport(string name, bool buildPass, string? framework, string? langVersion, bool supportsFeature)
{
string workingDir = CreateTemporaryFolder(folderName: $"{name}-{langVersion ?? "null"}-{framework ?? "null"}");
Expand Down Expand Up @@ -684,7 +688,9 @@ public void NullableSupport(string name, bool buildPass, string? framework, stri

[Theory]
//creates all possible combinations for supported templates, language versions and frameworks
#pragma warning disable CA1825 // Avoid zero-length array allocations. https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(ImplicitUsingsSupport_Data))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
public void ImplicitUsingsSupport(string name, bool buildPass, string? framework, string? langVersion, bool supportsFeature)
{
string workingDir = CreateTemporaryFolder(folderName: $"{name}-{langVersion ?? "null"}-{framework ?? "null"}");
Expand Down Expand Up @@ -771,7 +777,9 @@ public void ImplicitUsingsSupport(string name, bool buildPass, string? framework

[Theory]
//creates all possible combinations for supported templates, language versions and frameworks
#pragma warning disable CA1825 // Avoid zero-length array allocations.https://github.com/dotnet/sdk/issues/28672
[MemberData(nameof(FileScopedNamespacesSupport_Data))]
#pragma warning restore CA1825 // Avoid zero-length array allocations.
public void FileScopedNamespacesSupport(string name, bool pass, string? framework, string? langVersion, bool supportsFeature)
{
string workingDir = CreateTemporaryFolder(folderName: $"{name}-{langVersion ?? "null"}-{framework ?? "null"}");
Expand Down

0 comments on commit 3a31c64

Please sign in to comment.