Skip to content
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.

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

[release/7.0.4xx] Update dependencies from dotnet/roslyn #31633

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
1574f15
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 6, 2023
7c7954c
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 6, 2023
7e5fd55
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 6, 2023
95f2a8e
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 6, 2023
010eacf
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
369e57e
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
2d5d318
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
685798c
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
8627c22
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
9a78bec
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
c8203cd
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
5dd3640
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 8, 2023
3fa2250
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 8, 2023
01de492
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 8, 2023
e1e4999
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 8, 2023
65c52e9
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 8, 2023
8275211
Merge branch 'release/7.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Apr 10, 2023
586996f
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 10, 2023
d526c39
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
289778d
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
ecad6be
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
119b500
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
cf8c28b
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
633983c
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
1aac037
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
fb085bc
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
5face48
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
ff63405
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
5fd3a11
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
bd33864
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
b133728
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
3eba9ca
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
5b2ae02
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 12, 2023
ed669dd
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 12, 2023
718972d
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 12, 2023
f4d45e2
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 12, 2023
353ab8c
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
ed52476
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
a69101f
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
dd1cf20
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
2a5f74b
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
8976e2c
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
f597db6
Update layout path for MS.Net.Compiler.Toolset
Apr 13, 2023
5131d8a
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
a92aa0e
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
f5b3d9d
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
d93d17e
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
1eb2e56
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
b942af1
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 2023
48ca051
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 13, 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,34 +72,34 @@
<Sha>49c2ef651359526841d13e66129b71d1bcd9cef9</Sha>
<SourceBuildTarball RepoName="format" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0-3.23206.9">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-1.23213.8">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bd2384c7889b7a141ba0c7a23aebc5b44f1f237</Sha>
<Sha>a3e1c6a90a83af8633c73ffbf63876709231f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="7.0.4-servicing.23119.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/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 @@ -142,13 +142,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23206.9</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.6.0-3.23206.9</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.6.0-3.23206.9</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.6.0-3.23206.9</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.6.0-3.23206.9</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.6.0-3.23206.9</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.6.0-3.23206.9</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23213.8</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.7.0-1.23213.8</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.7.0-1.23213.8</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.7.0-1.23213.8</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.7.0-1.23213.8</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.7.0-1.23213.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.7.0-1.23213.8</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Layout/redist/targets/GenerateLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
then need the version file there as well. -->
<Copy SourceFiles="$(OutputPath)/.version" DestinationFiles="$(BaseOutputPath)$(Configuration)/.version" SkipUnchangedFiles="true" />


</Target>

<Target Name="PublishRoslyn"
Expand All @@ -27,7 +27,7 @@
<RoslynDirectory>$(OutputPath)/Roslyn</RoslynDirectory>
</PropertyGroup>
<ItemGroup>
<RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetPackageVersion)/tasks/net6.0/**/*" />
<RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetPackageVersion)/tasks/netcore/**/*" />
</ItemGroup>
<Error Condition="'@(RoslynBits)' == ''" Text="Something moved around in Roslyn package, adjust code here accordingly. TFM change?" />
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
Expand Down Expand Up @@ -56,7 +56,7 @@
<AnalyzerTargets Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)/build/Microsoft.CodeAnalysis.NetAnalyzers.props" />
<AnalyzerTargets Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)/build/Microsoft.CodeAnalysis.NetAnalyzers.targets" />
<AnalyzerConfig Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)/build/config/**/*" />

<ILLinkAnalyzersTargets Include="$(PkgMicrosoft_NET_ILLink_Analyzers)/build/Microsoft.NET.ILLink.Analyzers.props" />
<ILLinkAnalyzersAssemblies Include="$(PkgMicrosoft_NET_ILLink_Analyzers)/analyzers/dotnet/cs/**/*.dll" />

Expand Down Expand Up @@ -167,7 +167,7 @@
<Namespace Prefix="dn" Uri="http://schemas.microsoft.com/developer/msbuild/2003" />
</MSBuildNamespaces>
</PropertyGroup>

<XmlPoke
XmlInputPath="$(OutputPath)Sdks\Microsoft.NET.Sdk.Web\Sdk\Sdk.props"
Value="$(Version)"
Expand Down