Skip to content

Commit bacfc07

Browse files
author
dotnet-automerge-bot
authored
Merge pull request #7305 from dotnet/merges/master-to-release/dev16.3
Merge master to release/dev16.3
2 parents 8e8a754 + e1c5ca2 commit bacfc07

6 files changed

Lines changed: 7 additions & 5 deletions

File tree

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19378.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19380.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
8+
<Sha>def377f94747dac91482aad67b33a1c011ffc770</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.6.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.7.1"/>
44
</packages>

eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
continueOnError: ${{ parameters.continueOnError }}
4747
- ${{ if eq(parameters.overrideParameters, '') }}:
4848
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
49-
-GuardianPackageName Microsoft.Guardian.Cli.0.6.0
49+
-GuardianPackageName Microsoft.Guardian.Cli.0.7.1
5050
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
5151
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
5252
${{ parameters.additionalParameters }}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19378.1",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19380.3",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

src/fsharp/FSharp.Compiler.LanguageServer/FSharp.Compiler.LanguageServer.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
99
<IsPackable>true</IsPackable>
1010
<PackageDescription>Implements the Language Server Protocol (LSP) for F#.</PackageDescription>
11+
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
1112
</PropertyGroup>
1213

1314
<ItemGroup>

tests/FSharp.Compiler.LanguageServer.UnitTests/FSharp.Compiler.LanguageServer.UnitTests.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<OutputType>Library</OutputType>
88
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
99
<UnitTestType>nunit</UnitTestType>
10+
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

0 commit comments

Comments
 (0)