Mirror
/
dotnet-winforms
mirror of https://github.com/dotnet/winforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[main] Update dependencies from dotnet/arcade (#7766) 

Update dependencies from https://github.com/dotnet/arcade build 20220912.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.22456.4 -> To Version 8.0.0-beta.22462.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
pull/7772/head
dotnet-maestro[bot] 3 years ago
committed by GitHub
parent
09474ce0d0
commit
fdeea83ea5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      eng/Version.Details.xml
  2. 6
      eng/Versions.props
  3. 2
      eng/common/generate-locproject.ps1
  4. 5
      eng/common/sdl/NuGet.config
  5. 1
      eng/common/sdl/sdl.ps1
  6. 6
      eng/common/templates/steps/execute-sdl.yml
  7. 6
      global.json

24
eng/Version.Details.xml
View File

@ -130,29 +130,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<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>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22456.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22462.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
</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>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22456.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22462.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22456.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22462.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22456.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22462.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
<Sha>91db46836065516e87e05bbdb51c5aee0f90428c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

6
eng/Versions.props
View File

@ -52,9 +52,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.22456.4</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22456.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.22456.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.22462.4</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22462.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.22462.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

2
eng/common/generate-locproject.ps1
View File

@ -91,6 +91,7 @@ $locJson = @{
)
},
@{
LanguageSet = $LanguageSet
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "wxl_loc.lss" )
LocItems = @(
@ -110,7 +111,6 @@ $locJson = @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
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"
}
}
}

5
eng/common/sdl/NuGet.config
View File

@ -7,6 +7,11 @@
<clear />
<add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="guardian">
<package pattern="microsoft.guardian.cli" />
</packageSource>
</packageSourceMapping>
<disabledPackageSources>
<clear />
</disabledPackageSources>

1
eng/common/sdl/sdl.ps1
View File

@ -1,6 +1,7 @@
function Install-Gdn {
param(
[Parameter(Mandatory=$true)]
[string]$Path,
# If omitted, install the latest version of Guardian, otherwise install that specific version.

6
eng/common/templates/steps/execute-sdl.yml
View File

@ -17,14 +17,16 @@ steps:
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
- 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 }}
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
displayName: Install Guardian (Overridden)
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
- 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
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
displayName: Install Guardian

6
global.json
View File

@ -14,9 +14,9 @@
"version": "8.0.100-alpha.1.22423.9"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22456.4",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22456.4",
"Microsoft.DotNet.Helix.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.22462.4",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22462.4",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22462.15"
},

Write Preview
Loading…
Cancel
Save