Merge branch 'master' into XamlApp
This commit is contained in:
Коммит
728e61cf87
|
@ -46,7 +46,7 @@
|
|||
<Reference Include="System.Management" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||
<PackageReference Include="System.Management" Version="4.6.0-preview4.19212.13" />
|
||||
<PackageReference Include="System.Management" Version="4.6.0-preview5.19224.8" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\Microsoft.Toolkit.Win32.UI.Controls\Interop\Win32\ExternDll.cs" Link="ExternDll.cs" />
|
||||
|
|
|
@ -28,7 +28,7 @@ steps:
|
|||
- task: DotNetCoreInstaller@0
|
||||
inputs:
|
||||
packageType: 'sdk'
|
||||
version: '3.0.100-preview4-011223'
|
||||
version: '3.0.100-preview5-011568'
|
||||
displayName: Install Dot Net Core SDK 3.0
|
||||
|
||||
- task: DotNetCoreCLI@2
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "3.0.100-preview4-011223"
|
||||
"version": "3.0.100-preview5-011568"
|
||||
}
|
||||
}
|
Загрузка…
Ссылка в новой задаче