Skip to content

Commit c74905d

Browse files
author
Mirroring
committed
Merge commit 'ad560cbf8d3188480b244eeb42cd512ec4d19335'
2 parents fb64924 + ad560cb commit c74905d

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1/nuget/v3/index.json" />
3434
<!-- End: Package sources from dotnet-aspnetcore -->
3535
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
36-
<add key="darc-pub-DotNet-msbuild-Trusted-f7ab67b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f7ab67b0/nuget/v3/index.json" />
36+
<add key="darc-pub-DotNet-msbuild-Trusted-e0b90a9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e0b90a9a/nuget/v3/index.json" />
3737
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3838
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3939
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.26">
76+
<Dependency Name="Microsoft.Build" Version="17.12.27">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
78+
<Sha>e0b90a9a8ad3d8fdd186566b33859450c9e4e06c</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.26-preview-25071-08">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.27-preview-25106-01">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
82+
<Sha>e0b90a9a8ad3d8fdd186566b33859450c9e4e06c</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.26-preview-25071-08">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.27-preview-25106-01">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
87+
<Sha>e0b90a9a8ad3d8fdd186566b33859450c9e4e06c</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -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.25076.6">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25105.5">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
102+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25076.6">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25105.5">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
107+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25076.6">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25105.5">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
112+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25076.6">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25105.5">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
116+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25076.6">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25105.5">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
120+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25076.6">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25105.5">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
124+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25076.6">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25105.5">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
128+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25076.6">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25105.5">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
132+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25076.6">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25105.5">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>449a6208fa043f61558b00d0d1c4738c6bedf2ee</Sha>
136+
<Sha>25acc509a1cb1d1a4923b0091cbc5ce837b024d0</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.2-rtm.25067.4">
139139
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.26</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.26-preview-25071-08</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.27</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.27-preview-25106-01</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25076.6</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25076.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25076.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25105.5</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25105.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

0 commit comments

Comments
 (0)