Merge branch 'release/5.0.2xx' into master

This commit is contained in:
William Li 2021-01-25 21:40:24 -08:00
commit b056ae09eb

View file

@ -49,8 +49,8 @@
$(SdkOutputDirectory)**/VBCSCompiler.dll; $(SdkOutputDirectory)**/VBCSCompiler.dll;
$(SdkOutputDirectory)**/vbc.exe; $(SdkOutputDirectory)**/vbc.exe;
$(SdkOutputDirectory)**/vbc.dll; $(SdkOutputDirectory)**/vbc.dll;
$(SdkOutputDirectory)**/fsc.exe; $(SdkOutputDirectory)**/fsc.dll;
$(SdkOutputDirectory)**/fsi.exe; $(SdkOutputDirectory)**/fsi.dll;
$(SdkOutputDirectory)**/FSharp.*.dll; $(SdkOutputDirectory)**/FSharp.*.dll;
$(SdkOutputDirectory)**/Interactive.DependencyManager.dll; $(SdkOutputDirectory)**/Interactive.DependencyManager.dll;
$(SdkOutputDirectory)**/dotnet.dll; $(SdkOutputDirectory)**/dotnet.dll;
@ -74,7 +74,9 @@
$(SdkOutputDirectory)**/MessagePack.Annotations.dll; $(SdkOutputDirectory)**/MessagePack.Annotations.dll;
$(SdkOutputDirectory)**/MessagePack.dll; $(SdkOutputDirectory)**/MessagePack.dll;
$(SdkOutputDirectory)**/Nerdbank.Streams.dll; $(SdkOutputDirectory)**/Nerdbank.Streams.dll;
$(SdkOutputDirectory)**/StreamJsonRpc.dll" /> $(SdkOutputDirectory)**/StreamJsonRpc.dll;
$(SdkOutputDirectory)**/dotnet-watch*.dll;
$(SdkOutputDirectory)**/DotNetWatchTasks.dll;" />
</ItemGroup> </ItemGroup>
<Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(LayoutFilesToSign)' == ''" <Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(LayoutFilesToSign)' == ''"