Skip to content

Commit c07c8eb

Browse files
psfinakipsfinaki
authored
Merge pull request #17316 from dotnet/merges/main-to-release/dev17.11
Merge main to release/dev17.11
2 parents ae69b97 + b12c03e commit c07c8eb

File tree

6 files changed

+28
-31
lines changed

6 files changed

+28
-31
lines changed

‎azure-pipelines-PR.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ stages:
507507
# MacOS
508508
- job: MacOS
509509
pool:
510-
vmImage: macos-11
510+
vmImage: macos-12
511511
variables:
512512
- name: _SignType
513513
value: Test
@@ -642,7 +642,7 @@ stages:
642642
# Plain FCS build Mac
643643
- job: Plain_Build_MacOS
644644
pool:
645-
vmImage: macos-11
645+
vmImage: macos-12
646646
variables:
647647
- name: _BuildConfig
648648
value: Debug
@@ -722,4 +722,4 @@ stages:
722722
targetPath: './artifacts/log/Release/AheadOfTime/Trimming/'
723723
artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
724724
continueOnError: true
725-
condition: always()
725+
condition: always()

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
</Dependency>
3131
</ProductDependencies>
3232
<ToolsetDependencies>
33-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24310.5">
33+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24311.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>9f6799fdc16ae19b3e9478c55b997a6aab839d09</Sha>
35+
<Sha>c214b6ad17aedca4fa48294d80f6c52ef2463081</Sha>
3636
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"perl": "5.38.2.2"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5",
20+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3",
2121
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2222
}
2323
}

‎src/Compiler/Interactive/fsihelp.fs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
module FSharp.Compiler.Interactive.FsiHelp
22

3-
[<assembly: System.Runtime.InteropServices.ComVisible(false)>]
4-
[<assembly: System.CLSCompliant(true)>]
5-
do ()
6-
73
open System
84
open System.Collections.Generic
95
open System.IO

‎src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<NuspecProperty Include="fSharpCompilerServicePackageVersion=$(FSharpCompilerServicePackageVersion)" />
2626
<NuspecProperty Include="artifactsPackagesDir=$(ArtifactsPackagesDir)" />
2727
<NuspecProperty Include="fSharpNetCoreProductTargetFramework=$(FSharpNetCoreProductTargetFramework)" />
28+
<NuspecProperty Include="configuration=$(Configuration)" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

‎src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,33 @@
2626
this approach gives a very small deployment. Which is kind of necessary.
2727
-->
2828
<!-- assemblies -->
29-
<file src="fsc\Release\$fSharpNetCoreProductTargetFramework$\fsc.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
30-
<file src="fsi\Release\$fSharpNetCoreProductTargetFramework$\fsi.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
31-
<file src="FSharp.Core\Release\netstandard2.0\FSharp.Core.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
32-
<file src="FSharp.Core\Release\netstandard2.0\FSharp.Core.xml" target="lib\$fSharpNetCoreProductTargetFramework$" />
33-
<file src="FSharp.Compiler.Service\Release\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
34-
<file src="FSharp.Build\Release\netstandard2.0\FSharp.Build.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
35-
<file src="FSharp.DependencyManager.Nuget\Release\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
29+
<file src="fsc\$configuration$\$fSharpNetCoreProductTargetFramework$\fsc.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
30+
<file src="fsi\$configuration$\$fSharpNetCoreProductTargetFramework$\fsi.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
31+
<file src="FSharp.Core\$configuration$\netstandard2.0\FSharp.Core.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
32+
<file src="FSharp.Core\$configuration$\netstandard2.0\FSharp.Core.xml" target="lib\$fSharpNetCoreProductTargetFramework$" />
33+
<file src="FSharp.Compiler.Service\$configuration$\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
34+
<file src="FSharp.Build\$configuration$\netstandard2.0\FSharp.Build.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
35+
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
3636
target="lib\$fSharpNetCoreProductTargetFramework$" />
37-
<file src="FSharp.Compiler.Interactive.Settings\Release\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
37+
<file src="FSharp.Compiler.Interactive.Settings\$configuration$\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
3838
target="lib\$fSharpNetCoreProductTargetFramework$" />
3939
<!-- additional files -->
40-
<file src="FSharp.Compiler.Service\Release\netstandard2.0\default.win32manifest" target="contentFiles\any\any" />
41-
<file src="FSharp.Build\Release\netstandard2.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
42-
<file src="FSharp.Build\Release\netstandard2.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
43-
<file src="FSharp.Build\Release\netstandard2.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
44-
<file src="FSharp.Build\Release\netstandard2.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
45-
<file src="FSharp.Build\Release\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
40+
<file src="FSharp.Compiler.Service\$configuration$\netstandard2.0\default.win32manifest" target="contentFiles\any\any" />
41+
<file src="FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
42+
<file src="FSharp.Build\$configuration$\netstandard2.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
43+
<file src="FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
44+
<file src="FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
45+
<file src="FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
4646

4747
<!-- resources -->
48-
<file src="FSharp.Core\Release\netstandard2.0\**\FSharp.Core.resources.dll"
48+
<file src="FSharp.Core\$configuration$\netstandard2.0\**\FSharp.Core.resources.dll"
4949
target="lib\$fSharpNetCoreProductTargetFramework$" />
50-
<file src="FSharp.Compiler.Service\Release\netstandard2.0\**\FSharp.Compiler.Service.resources.dll"
50+
<file src="FSharp.Compiler.Service\$configuration$\netstandard2.0\**\FSharp.Compiler.Service.resources.dll"
5151
target="lib\$fSharpNetCoreProductTargetFramework$" />
52-
<file src="FSharp.Compiler.Interactive.Settings\Release\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
52+
<file src="FSharp.Compiler.Interactive.Settings\$configuration$\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
5353
target="lib\$fSharpNetCoreProductTargetFramework$" />
54-
<file src="FSharp.Build\Release\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
55-
<file src="FSharp.DependencyManager.Nuget\Release\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
54+
<file src="FSharp.Build\$configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\$fSharpNetCoreProductTargetFramework$" />
55+
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
5656
target="lib\$fSharpNetCoreProductTargetFramework$" />
5757

5858
<file src="$artifactsPackagesDir$Dependency\Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
@@ -61,7 +61,7 @@
6161
<file src="$artifactsPackagesDir$Dependency\Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
6262
<file src="$artifactsPackagesDir$Dependency\Release\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg" target="contentFiles\Release" />
6363

64-
<file src="FSharp.Build\Release\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\Shipping" />
65-
<file src="FSharp.Build\Release\netstandard2.0\Release\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\Release" />
64+
<file src="FSharp.Build\$configuration$\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\Shipping" />
65+
<file src="FSharp.Build\$configuration$\netstandard2.0\Release\Microsoft.FSharp.Core.NetSdk.props" target="contentFiles\Release" />
6666
</files>
6767
</package>

0 commit comments

Comments
 (0)