Skip to content

Commit 882a389

Browse files
nohwndnohwnd
committed
Merge branch 'main' of https://github.com/dotnet/sdk into nohwnd-patch-1
2 parents eb25d4f + 094238c commit 882a389

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-alpha.1.25057.1">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-alpha.1.25057.11">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>89b8b37d6d6f5eeea72747a7e9f90aed4b7abed1</Sha>
6+
<Sha>88673185ead8999b65e57ff791aa7e26eb2b773a</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-alpha.1.25057.1">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-alpha.1.25057.11">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>89b8b37d6d6f5eeea72747a7e9f90aed4b7abed1</Sha>
10+
<Sha>88673185ead8999b65e57ff791aa7e26eb2b773a</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-alpha.1.25057.1">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-alpha.1.25057.11">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>89b8b37d6d6f5eeea72747a7e9f90aed4b7abed1</Sha>
15+
<Sha>88673185ead8999b65e57ff791aa7e26eb2b773a</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25052.4">
@@ -73,18 +73,18 @@
7373
<Sha>953fd74cd26884432eee21244ff4b031ebbdde32</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25056-07">
76+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25057-10">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>8d395fd2729ad43428252f37656eb5c97a180987</Sha>
78+
<Sha>b497794a81585d40ba5401acde02200f7b7d863b</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25056-07">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25057-10">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>8d395fd2729ad43428252f37656eb5c97a180987</Sha>
82+
<Sha>b497794a81585d40ba5401acde02200f7b7d863b</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25056-07">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25057-10">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>8d395fd2729ad43428252f37656eb5c97a180987</Sha>
87+
<Sha>b497794a81585d40ba5401acde02200f7b7d863b</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.25056.5">
@@ -97,43 +97,43 @@
9797
<Sha>63a09289745da5c256e7baf5f4194a750b1ec878</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25056.21">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25057.3">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
102+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25056.21">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25057.3">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
107+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25056.21">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25057.3">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
112+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25056.21">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25057.3">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
116+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25056.21">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25057.3">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
120+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25056.21">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25057.3">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
124+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25056.21">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25057.3">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
128+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25056.21">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25057.3">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
132+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25056.21">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25057.3">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
136+
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25056.9">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,20 +185,20 @@
185185
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
186186
187187
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
188-
<MicrosoftBuildVersion>17.14.0-preview-25056-07</MicrosoftBuildVersion>
189-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25056-07</MicrosoftBuildLocalizationVersion>
188+
<MicrosoftBuildVersion>17.14.0-preview-25057-10</MicrosoftBuildVersion>
189+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25057-10</MicrosoftBuildLocalizationVersion>
190190
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
191191
<MinimumVSVersion>17.12</MinimumVSVersion>
192192
</PropertyGroup>
193193
<PropertyGroup>
194194
<!-- Dependencies from https://github.com/dotnet/templating -->
195-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.25057.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
195+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-alpha.1.25057.11</MicrosoftTemplateEngineAbstractionsPackageVersion>
196196
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
197197
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
198198
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
199199
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
200200
<!-- test dependencies -->
201-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.25057.1</MicrosoftTemplateEngineMocksPackageVersion>
201+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-alpha.1.25057.11</MicrosoftTemplateEngineMocksPackageVersion>
202202
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
203203
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
204204
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -209,14 +209,14 @@
209209
</PropertyGroup>
210210
<PropertyGroup>
211211
<!-- Dependencies from https://github.com/dotnet/roslyn -->
212-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25056.21</MicrosoftNetCompilersToolsetVersion>
213-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25056.21</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisPackageVersion>
215-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpPackageVersion>
216-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
212+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25057.3</MicrosoftNetCompilersToolsetVersion>
213+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25057.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25057.3</MicrosoftCodeAnalysisPackageVersion>
215+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25057.3</MicrosoftCodeAnalysisCSharpPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25057.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25057.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25057.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25057.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

0 commit comments

Comments
 (0)