Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release/6.0.1xx' into internal…
Browse files Browse the repository at this point in the history
…/release/6.0.1xx
  • Loading branch information
mmitche committed Nov 18, 2021
2 parents a35d9cf + 328e13c commit 95eaa4d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,30 +88,30 @@
<Sha>68bc36719088c86b0ff01334039b0611741b8276</Sha>
<SourceBuildTarball RepoName="format" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-6.21526.21">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.21568.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.0.0-6.21526.21">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.0.1-1.21568.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.0.0">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.0.1-1.21568.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>df45061e218c9b5813c5531bc06fb238a23e30f6</Sha>
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.0.0-6.21526.21">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.0.1-1.21568.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.0">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1-1.21568.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>df45061e218c9b5813c5531bc06fb238a23e30f6</Sha>
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.0-6.21526.21">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.1-1.21568.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
<Sha>6ab6601178d9fba8c680b56934cd1742e0816bff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.1-servicing.21567.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-6.21526.21</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.0.0-6.21526.21</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-6.21526.21</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-6.21526.21</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.0.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.0.1-1.21568.1</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.0.1-1.21568.1</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.1-1.21568.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.1-1.21568.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.1-1.21568.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.0.1-1.21568.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
Expand Down

0 comments on commit 95eaa4d

Please sign in to comment.