Skip to content

Commit 4b2ae0e

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-8f692247-5bbd-4283-ab8d-a19a4115d6ae
2 parents 0a17366 + 52b2439 commit 4b2ae0e

File tree

3 files changed

+31
-25
lines changed

3 files changed

+31
-25
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
3838
<add key="darc-pub-dotnet-templating-a0bc400" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-a0bc400-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-8/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-a0bc400-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-7/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-a0bc400-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-6/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-a0bc400-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-5/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-a0bc400-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-4/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-a0bc400-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-3/nuget/v3/index.json" />
3945
<add key="darc-pub-dotnet-templating-a0bc400-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-2/nuget/v3/index.json" />
4046
<add key="darc-pub-dotnet-templating-a0bc400-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a0bc400b-1/nuget/v3/index.json" />
4147
<!-- End: Package sources from dotnet-templating -->

‎eng/Version.Details.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,41 +97,41 @@
9797
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25173.5">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25256.6">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102102
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25173.5">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25256.6">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107107
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25173.5">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25256.6">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112112
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25173.5">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25256.6">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116116
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25173.5">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25256.6">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120120
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25173.5">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25256.6">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124124
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25173.5">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25256.6">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128128
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25173.5">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25256.6">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25173.5">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25256.6">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136136
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
137137
</Dependency>
@@ -325,20 +325,20 @@
325325
<Sha>d5dc8a13cc618b9cbdc1e5744b4806c594d49553</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25175.6">
328+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25256.3">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330330
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25175.6">
332+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25256.3">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334334
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25175.6">
336+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25256.3">
337337
<Uri>https://github.com/dotnet/razor</Uri>
338338
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
339339
</Dependency>
340340
<!-- Intermediate is necessary for source build. -->
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25175.6">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25256.3">
342342
<Uri>https://github.com/dotnet/razor</Uri>
343343
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />

‎eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>06</VersionFeature>
9+
<VersionFeature>07</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25173.5</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25173.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25256.6</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25256.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -231,9 +231,9 @@
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Dependencies from https://github.com/dotnet/razor -->
234-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25175.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25175.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25175.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
234+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25256.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25256.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25256.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)