Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
This commit is contained in:
Larry Ewing
GitHub
commit
e40dead297
4 changed files with 192 additions and 1 deletions
|
|
@ -19,7 +19,7 @@
|
|||
prep.sh and pipeline scripts, outside of MSBuild.
|
||||
-->
|
||||
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.7.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
|
||||
<PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-19.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
|
||||
<PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-20.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
|
||||
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23210.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Thalman <mthalman@microsoft.com>
|
||||
Date: Mon, 17 Apr 2023 12:26:51 -0500
|
||||
Subject: [PATCH] Explicitly cast default for Task.Delay method
|
||||
|
||||
Backport: Not needed since this code is removed in latest version of command-line-api
|
||||
---
|
||||
src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
|
||||
index 0fb30887..cd59971d 100644
|
||||
--- a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
|
||||
+++ b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
|
||||
@@ -107,7 +107,7 @@ namespace System.CommandLine
|
||||
if (timeout! > TimeSpan.Zero)
|
||||
{
|
||||
Task
|
||||
- .Delay(timeout.Value, default)
|
||||
+ .Delay(timeout.Value, (CancellationToken)default)
|
||||
.ContinueWith(t =>
|
||||
{
|
||||
// Prevent our ProcessExit from intervene and block the exit
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LCX SchemaVersion="6.0" Name="D:\a\_work\1\s\src\redist\targets\packaging\osx\clisdk\resources\conclusion.html" PsrId="22" FileType="1" SrcCul="en-US" Desc="Commenting file created by LCXAdmin. For more information, please visit http://localizability/longhorn/LcxAdmin.asp" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
|
||||
<OwnedComments>
|
||||
<Cmt Name="LcxAdmin" />
|
||||
</OwnedComments>
|
||||
<Item ItemId=";Attributes" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
|
||||
<Item ItemId=";align" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Str" Disp="true" LocTbl="false" />
|
||||
<Item ItemId="0;0b232ca5c87c0123c6f54f37576b9bcf" ItemType="23;Attr:<DIV>:align" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Property" UsrLk="true">
|
||||
<Val><![CDATA[left]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="2" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="1;0b232ca5c87c0123c6f54f37576b9bcf" ItemType="23;Attr:<DIV>:align" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Property" UsrLk="true">
|
||||
<Val><![CDATA[left]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="8" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="2;0b232ca5c87c0123c6f54f37576b9bcf" ItemType="23;Attr:<DIV>:align" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Property" UsrLk="true">
|
||||
<Val><![CDATA[left]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="12" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
</Item>
|
||||
<Item ItemId=";charset" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Str" Disp="true" LocTbl="false" />
|
||||
<Item ItemId="0;bfca00b0e0c56e9d0dcf189318935756" ItemType="23;Attr:<META>:charset" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Text" UsrLk="true">
|
||||
<Val><![CDATA[utf-8]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="1" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
</Item>
|
||||
</Item>
|
||||
<Item ItemId=";CSS Properties" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
|
||||
<Item ItemId=";font-family" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Str" Disp="true" LocTbl="false" />
|
||||
<Item ItemId="0;481e5bb208bdaa170e6b4abf59597f63" ItemType="26;Style:<DIV>:font-family" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Font Name" UsrLk="true">
|
||||
<Val><![CDATA[Helvetica]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="3" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="1;481e5bb208bdaa170e6b4abf59597f63" ItemType="26;Style:<DIV>:font-family" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Font Name" UsrLk="true">
|
||||
<Val><![CDATA[Helvetica]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="9" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="2;481e5bb208bdaa170e6b4abf59597f63" ItemType="26;Style:<DIV>:font-family" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Font Name" UsrLk="true">
|
||||
<Val><![CDATA[Helvetica]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="13" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
</Item>
|
||||
</Item>
|
||||
</LCX>
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LCX SchemaVersion="6.0" Name="D:\a\_work\1\s\src\redist\targets\packaging\osx\clisdk\resources\welcome.html" PsrId="22" FileType="1" SrcCul="en-US" Desc="Commenting file created by LCXAdmin. For more information, please visit http://localizability/longhorn/LcxAdmin.asp" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
|
||||
<OwnedComments>
|
||||
<Cmt Name="LcxAdmin" />
|
||||
</OwnedComments>
|
||||
<Item ItemId=";Attributes" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
|
||||
<Item ItemId=";align" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Str" Disp="true" LocTbl="false" />
|
||||
<Item ItemId="0;0b232ca5c87c0123c6f54f37576b9bcf" ItemType="23;Attr:<DIV>:align" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Property" UsrLk="true">
|
||||
<Val><![CDATA[left]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="2" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="1;0b232ca5c87c0123c6f54f37576b9bcf" ItemType="23;Attr:<DIV>:align" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Property" UsrLk="true">
|
||||
<Val><![CDATA[left]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="6" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="2;0b232ca5c87c0123c6f54f37576b9bcf" ItemType="23;Attr:<DIV>:align" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Property" UsrLk="true">
|
||||
<Val><![CDATA[left]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="13" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
</Item>
|
||||
<Item ItemId=";charset" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Str" Disp="true" LocTbl="false" />
|
||||
<Item ItemId="0;bfca00b0e0c56e9d0dcf189318935756" ItemType="23;Attr:<META>:charset" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Text" UsrLk="true">
|
||||
<Val><![CDATA[utf-8]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="1" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
</Item>
|
||||
</Item>
|
||||
<Item ItemId=";CSS Properties" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
|
||||
<Item ItemId=";font-family" ItemType="0" PsrId="22" Leaf="false">
|
||||
<Disp Icon="Str" Disp="true" LocTbl="false" />
|
||||
<Item ItemId="0;481e5bb208bdaa170e6b4abf59597f63" ItemType="26;Style:<DIV>:font-family" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Font Name" UsrLk="true">
|
||||
<Val><![CDATA[Helvetica]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="3" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="1;481e5bb208bdaa170e6b4abf59597f63" ItemType="26;Style:<DIV>:font-family" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Font Name" UsrLk="true">
|
||||
<Val><![CDATA[Helvetica]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="7" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
<Item ItemId="2;481e5bb208bdaa170e6b4abf59597f63" ItemType="26;Style:<DIV>:font-family" PsrId="22" InstFlg="true" Leaf="true">
|
||||
<Str Cat="Font Name" UsrLk="true">
|
||||
<Val><![CDATA[Helvetica]]></Val>
|
||||
</Str>
|
||||
<Disp Icon="Str" Order="14" />
|
||||
<Cmts>
|
||||
<Cmt Name="LcxAdmin"><![CDATA[{Locked}]]></Cmt>
|
||||
</Cmts>
|
||||
</Item>
|
||||
</Item>
|
||||
</Item>
|
||||
</LCX>
|
||||
Loading…
Add table
Add a link
Reference in a new issue