Skip to content

Commit a0f30b2

Browse files
authored
Update Versions.props (#39842)
1 parent 12cd76d commit a0f30b2

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4343
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
4444
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
45-
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
45+
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetVersion)" />
4646
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4747
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
4848
<PackageVersion Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />

eng/Versions.props

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
3-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project DefaultTargets="Build">
42
<PropertyGroup>
53
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
64
</PropertyGroup>
@@ -16,6 +14,10 @@
1614
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
1715
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
1816
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">4</PreReleaseVersionIteration>
17+
<!-- In source-build the version of the compiler must be same or newer than the version of the
18+
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
19+
in that build mode analyzer assemblies always target the live compiler API. -->
20+
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
1921
</PropertyGroup>
2022
<!-- Production Dependencies -->
2123
<PropertyGroup>
@@ -98,14 +100,14 @@
98100
up overwritten by properties flowing the newest version that are imported after this file.
99101
These should be used in places where we always want to target the latest. This includes source-only modes (always use the latest)
100102
as well as some additional cases like the msbuild that is redistributed in the SDK.
101-
103+
102104
In non-source-only modes, some tasks and the resolver will need to run in an MSBuild that is older
103105
than the very latest, based on what we want the SDK to support. So use a version that matches the version
104106
in minimumMSBuildVersion. In these cases, we don't want to use MicrosoftBuildVersion and other
105107
associated properties that are updated by the VMR infrastructure. So, we read this version
106108
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
107109
then use that in Directory.Packages.props.
108-
110+
109111
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
110112
<MicrosoftBuildVersion>17.10.0-preview-24177-05</MicrosoftBuildVersion>
111113
<MicrosoftBuildLocalizationVersion>17.10.0-preview-24177-05</MicrosoftBuildLocalizationVersion>
@@ -130,7 +132,7 @@
130132
</PropertyGroup>
131133
<PropertyGroup>
132134
<!-- Dependencies from https://github.com/dotnet/roslyn -->
133-
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24177.10</MicrosoftNetCompilersToolsetPackageVersion>
135+
<MicrosoftNetCompilersToolsetVersion>4.11.0-1.24177.10</MicrosoftNetCompilersToolsetVersion>
134136
<MicrosoftCodeAnalysisPackageVersion>4.11.0-1.24177.10</MicrosoftCodeAnalysisPackageVersion>
135137
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-1.24177.10</MicrosoftCodeAnalysisCSharpPackageVersion>
136138
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-1.24177.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>

src/Layout/redist/redist.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true"/>
4343
<PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="All" GeneratePathProperty="true" />
4444
<PackageReference Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" GeneratePathProperty="true" />
45-
<PackageDownload Include="Microsoft.Net.Compilers.Toolset" Version="[$(MicrosoftNetCompilersToolsetPackageVersion)]" />
45+
<PackageDownload Include="Microsoft.Net.Compilers.Toolset" Version="[$(MicrosoftNetCompilersToolsetVersion)]" />
4646
<PackageReference Include="Microsoft.Net.Compilers.Toolset.Framework" ExcludeAssets="All" GeneratePathProperty="true" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
4747

4848
<!-- Lift up dependencies of dependencies to prevent build tasks from getting pinned to older versions -->

src/Layout/redist/targets/GenerateLayout.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<RoslynDirectory>$(OutputPath)/Roslyn</RoslynDirectory>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetPackageVersion)/tasks/netcore/**/*" />
46+
<RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetVersion)/tasks/netcore/**/*" />
4747
</ItemGroup>
4848
<Error Condition="'@(RoslynBits)' == ''" Text="Something moved around in Roslyn package, adjust code here accordingly. TFM change?" />
4949
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />

0 commit comments

Comments
 (0)