Skip to content

Commit 6005cff

Browse files
[main] Source code updates from dotnet/dotnet (#19112)
* Backflow from https://github.com/dotnet/dotnet / cc7f6e8 build 291900 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 291900 No dependency updates to commit --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <[email protected]>
1 parent e69f692 commit 6005cff

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="01abb3ec5c4cbffec5b33e02156bd3d2a8913b04" BarId="286825" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="cc7f6e84d8dae36ad9ea51a5112627b8235982cc" BarId="291900" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25515-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>

eng/Versions.props

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<Project>
2-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
2+
3+
<Import Project="Version.Details.props" />
4+
5+
<!-- Arcade features-->
36
<PropertyGroup>
4-
<!-- opt-out properties -->
57
<UsingToolXUnit>false</UsingToolXUnit>
6-
<!-- opt-in properties -->
78
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
89
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
910
<UsingToolVSSDK>true</UsingToolVSSDK>
1011
</PropertyGroup>
12+
1113
<!-- Version number computation -->
1214
<PropertyGroup>
1315
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
@@ -53,6 +55,7 @@
5355
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
5456
<FSProductVersion>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion).$(FSToolsRevisionVersion)</FSProductVersion>
5557
</PropertyGroup>
58+
5659
<PropertyGroup>
5760
<!-- These have to be in sync with latest release branch -->
5861
<VSMajorVersion>18</VSMajorVersion>
@@ -61,11 +64,13 @@
6164
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6265
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
6366
</PropertyGroup>
67+
6468
<!-- version number assignment -->
6569
<PropertyGroup Condition="'$(UseFSharpPackageVersion)' == 'true'">
6670
<VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
6771
<AssemblyVersion>$(FSCoreVersion)</AssemblyVersion>
6872
</PropertyGroup>
73+
6974
<PropertyGroup Condition="'$(UseFSharpPackageVersion)' != 'true'">
7075
<VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
7176
<VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersionPrefix)</VersionPrefix>
@@ -74,6 +79,7 @@
7479
<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
7580
<!-- PR builds should explicitly specify a version number -->
7681
</PropertyGroup>
82+
7783
<!-- Dependencies from maintenance-packages, source-build specific -->
7884
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
7985
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
@@ -86,6 +92,7 @@
8692
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
8793
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
8894
</PropertyGroup>
95+
8996
<PropertyGroup>
9097
<!-- System.* packages -->
9198
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
@@ -161,4 +168,5 @@
161168
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>
162169
<!-- -->
163170
</PropertyGroup>
171+
164172
</Project>

0 commit comments

Comments
 (0)