Update dependencies from https://github.com/dotnet/arcade build 20210526.5 (#10783)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21272.1 to 1.0.0-beta.21275.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
9e501712a7
commit
f252443219
6 changed files with 12 additions and 12 deletions
|
@ -136,14 +136,14 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21275.5">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21276.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>579b548c545da1a9747bc5df599f38fe86d66251</Sha>
|
<Sha>c2a8af3f309fc27402fa9c18bac6df757a9c41ed</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21275.5">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21276.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>579b548c545da1a9747bc5df599f38fe86d66251</Sha>
|
<Sha>c2a8af3f309fc27402fa9c18bac6df757a9c41ed</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
@ -153,9 +153,9 @@
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
|
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.21272.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="XliffTasks" Version="1.0.0-beta.21275.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>f5321d0c7b3f5e6103440fc017253bcdb50a0a26</Sha>
|
<Sha>2f7e6e21fab95c1eab90142212e9af1ebf3211eb</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21275.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21276.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -60,8 +60,8 @@ while (($# > 0)); do
|
||||||
echo " - (default) %USERPROFILE%/.netcoreeng/native"
|
echo " - (default) %USERPROFILE%/.netcoreeng/native"
|
||||||
echo ""
|
echo ""
|
||||||
echo " --clean Switch specifying not to install anything, but cleanup native asset folders"
|
echo " --clean Switch specifying not to install anything, but cleanup native asset folders"
|
||||||
echo " --donotabortonfailure Switch specifying whether to abort native tools installation on failure"
|
echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure"
|
||||||
echo " --donotdisplaywarnings Switch specifying whether to display warnings during native tools installation on failure"
|
echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure"
|
||||||
echo " --force Clean and then install tools"
|
echo " --force Clean and then install tools"
|
||||||
echo " --help Print help and exit"
|
echo " --help Print help and exit"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
|
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Clear references, the SDK may add some depending on UsingToolXxx settings, but we only want to restore the following -->
|
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
|
||||||
<PackageReference Remove="@(PackageReference)"/>
|
<PackageReference Remove="@(PackageReference)"/>
|
||||||
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
|
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
|
||||||
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
|
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
|
||||||
|
|
|
@ -6,7 +6,7 @@ parameters:
|
||||||
# 'continueOnError', the parameter value is not correctly picked up.
|
# 'continueOnError', the parameter value is not correctly picked up.
|
||||||
# This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
|
# This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
|
||||||
sdlContinueOnError: false # optional: determines whether to continue the build if the step errors;
|
sdlContinueOnError: false # optional: determines whether to continue the build if the step errors;
|
||||||
downloadArtifacts: true # optional: determines if the artifacts should be downloaded
|
downloadArtifacts: true # optional: determines if the artifacts should be dowloaded
|
||||||
dependsOn: '' # Optional: dependencies of the job
|
dependsOn: '' # Optional: dependencies of the job
|
||||||
artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts
|
artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts
|
||||||
# Usage:
|
# Usage:
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21275.5",
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21276.5",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
|
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue