Skip to content

Commit 3df4292

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-ec9de1a0-a055-4643-b075-73193f96cb49
2 parents 9b9ab6e + 1a19d37 commit 3df4292

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

‎NuGet.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
<!-- Begin: Package sources from dotnet-runtime -->
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
38-
<add key="darc-pub-dotnet-templating-337d945" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-337d9459/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-861f0ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-861f0ec-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-3/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-861f0ec-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-2/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-861f0ec-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-1/nuget/v3/index.json" />
3942
<!-- End: Package sources from dotnet-templating -->
4043
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4144
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25329.7">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25404.5">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
102+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25329.7">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25404.5">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
107+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25329.7">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25404.5">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
112+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25329.7">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25404.5">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
116+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25329.7">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25404.5">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
120+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25329.7">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25404.5">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
124+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25329.7">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25404.5">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
128+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25329.7">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25404.5">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
132+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25329.7">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25404.5">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
136+
<Sha>4d68ef53bf037528cbe2066696b872aaa8b4fe36</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.7-servicing.25317.2">
139139
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25329.7</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25329.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25329.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25404.5</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25404.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25404.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

0 commit comments

Comments
 (0)