Update dependencies from https://github.com/dotnet/arcade build 20220912.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22456.4 -> To Version 8.0.0-beta.22462.4 Dependency coherency updates Microsoft.SourceLink.GitHub From Version 1.2.0-beta-22455-02 -> To Version 1.2.0-beta-22461-01 (parent: Microsoft.DotNet.Arcade.Sdk
This commit is contained in:
parent
ca2fa4e153
commit
a0f9e068de
7 changed files with 22 additions and 14 deletions
|
@ -194,18 +194,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22456.4">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22462.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
|
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22456.4">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22462.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
|
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22456.4">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22462.4">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
|
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22429.1">
|
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22429.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
@ -220,9 +220,9 @@
|
||||||
<Sha>3fe1ec969b4ce75f56a19079908ea04e56006129</Sha>
|
<Sha>3fe1ec969b4ce75f56a19079908ea04e56006129</Sha>
|
||||||
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22455-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22461-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||||
<Sha>490cf012e1712404185ea7669f5640e4aacc0c08</Sha>
|
<Sha>4d2cae3ec4edec7004c6e46cd6d1621966bf776d</Sha>
|
||||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22456.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22462.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -91,6 +91,7 @@ $locJson = @{
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
@{
|
@{
|
||||||
|
LanguageSet = $LanguageSet
|
||||||
CloneLanguageSet = "WiX_CloneLanguages"
|
CloneLanguageSet = "WiX_CloneLanguages"
|
||||||
LssFiles = @( "wxl_loc.lss" )
|
LssFiles = @( "wxl_loc.lss" )
|
||||||
LocItems = @(
|
LocItems = @(
|
||||||
|
@ -110,7 +111,6 @@ $locJson = @{
|
||||||
SourceFile = $sourceFile
|
SourceFile = $sourceFile
|
||||||
CopyOption = "LangIDOnPath"
|
CopyOption = "LangIDOnPath"
|
||||||
OutputPath = $outputPath
|
OutputPath = $outputPath
|
||||||
Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,11 @@
|
||||||
<clear />
|
<clear />
|
||||||
<add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
|
<add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
|
||||||
</packageSources>
|
</packageSources>
|
||||||
|
<packageSourceMapping>
|
||||||
|
<packageSource key="guardian">
|
||||||
|
<package pattern="microsoft.guardian.cli" />
|
||||||
|
</packageSource>
|
||||||
|
</packageSourceMapping>
|
||||||
<disabledPackageSources>
|
<disabledPackageSources>
|
||||||
<clear />
|
<clear />
|
||||||
</disabledPackageSources>
|
</disabledPackageSources>
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
|
|
||||||
function Install-Gdn {
|
function Install-Gdn {
|
||||||
param(
|
param(
|
||||||
|
[Parameter(Mandatory=$true)]
|
||||||
[string]$Path,
|
[string]$Path,
|
||||||
|
|
||||||
# If omitted, install the latest version of Guardian, otherwise install that specific version.
|
# If omitted, install the latest version of Guardian, otherwise install that specific version.
|
||||||
|
|
|
@ -17,14 +17,16 @@ steps:
|
||||||
|
|
||||||
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
|
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
|
||||||
- pwsh: |
|
- pwsh: |
|
||||||
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
|
Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl
|
||||||
|
. .\sdl.ps1
|
||||||
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }}
|
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }}
|
||||||
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
|
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
|
||||||
displayName: Install Guardian (Overridden)
|
displayName: Install Guardian (Overridden)
|
||||||
|
|
||||||
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
|
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
|
||||||
- pwsh: |
|
- pwsh: |
|
||||||
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
|
Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl
|
||||||
|
. .\sdl.ps1
|
||||||
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts
|
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts
|
||||||
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
|
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
|
||||||
displayName: Install Guardian
|
displayName: Install Guardian
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22456.4",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22462.4",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22456.4"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22462.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue