microsoft
/
BuildXL
зеркало из https://github.com/microsoft/BuildXL.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merged PR 670874: Revert 'Upgrade drop' 

Upgrade drop

Reverts !670396
This commit is contained in:
Julian Bayardo 2022-07-18 18:37:05 +00:00
Родитель beb1f8e646
Коммит ebb01f75a1
5 изменённых файлов: 30 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc
Просмотреть файл

@ -565,7 +565,7 @@ export function cacheBindingRedirects() {
name: "Microsoft.IdentityModel.Clients.ActiveDirectory",
publicKeyToken: "31bf3856ad364e35",
culture: "neutral",
oldVersion: "0.0.0.0-4.5.9.0",
oldVersion: "0.0.0.0-4.5.1.0",
newVersion: "4.5.1.0", // Corresponds to: { id: "Microsoft.IdentityModel.Clients.ActiveDirectory", version: "5.2.6",
},
{

26
Shared/Scripts/UpdateAdoPackages.ps1
Просмотреть файл

@ -3,14 +3,7 @@
$destination = 'https://pkgs.dev.azure.com/cloudbuild/_packaging/BuildXL.Selfhost/nuget/v3/index.json'
$source = 'https://pkgs.dev.azure.com/mseng/_packaging/VSOnline-Internal/nuget/v3/index.json'
$nugetPath = "nuget.exe"
$tempDirectory = Join-Path $env:TEMP "adoUpdateTemp"
New-Item -Path $tempDirectory -ItemType Directory -Force
$artifactVersion = '19.208.32712-buildid17682333'
$adoVersion = '19.208.0-internal202207122'
$adoVersion = '16.199.0-internal202201091'
$adoPackages = @(
'Microsoft.VisualStudio.Services.Client'
'Microsoft.VisualStudio.Services.InteractiveClient'
@ -25,6 +18,7 @@ $adoPackages = @(
'Microsoft.VisualStudio.Services.ServiceEndpoints.WebApi'
)
$artifactVersion = '18.199.32109-buildid16662423'
$artifactPackages = @(
'Microsoft.VisualStudio.Services.ArtifactServices.Shared'
'Microsoft.VisualStudio.Services.BlobStore.Client'
@ -41,22 +35,26 @@ $artifactPackages = @(
'Drop.App'
)
Foreach ($package in $adoPackages) {
$tempDirectory = '.\adoUpdateTemp'
Foreach ($package in $adoPackages)
{
$version = $adoVersion
Invoke-Expression "$nugetPath install $package -Version $version -DependencyVersion Ignore -DirectDownload -Source $source -OutputDirectory $tempDirectory"
nuget.exe install $package -Version $version -DependencyVersion Ignore -DirectDownload -Source $source -OutputDirectory $tempDirectory
$packageDirectory = "$package.$version"
$packageFile = "$packageDirectory.nupkg"
Invoke-Expression "$nugetPath push '$tempDirectory\$packageDirectory\$packageFile' -ApiKey ado -Source $destination -Timeout 3600 -SkipDuplicate"
nuget.exe push "$tempDirectory\$packageDirectory\$packageFile" -ApiKey ado -Source $destination
}
Foreach ($package in $artifactPackages) {
Foreach ($package in $artifactPackages)
{
$version = $artifactVersion
Invoke-Expression "$nugetPath install $package -Version $version -DependencyVersion Ignore -DirectDownload -Source $source -OutputDirectory $tempDirectory"
nuget.exe install $package -Version $version -DependencyVersion Ignore -DirectDownload -Source $source -OutputDirectory $tempDirectory
$packageDirectory = "$package.$version"
$packageFile = "$packageDirectory.nupkg"
Invoke-Expression "$nugetPath push '$tempDirectory\$packageDirectory\$packageFile' -ApiKey ado -Source $destination -Timeout 3600 -SkipDuplicate"
nuget.exe push "$tempDirectory\$packageDirectory\$packageFile" -ApiKey ado -Source $destination
}
Remove-Item $tempDirectory -Recurse

26
cg/nuget/cgmanifest.json
Просмотреть файл

@ -33,7 +33,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ArtifactServices.App.Shared",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -42,7 +42,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ArtifactServices.App.Shared.Cache",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -231,7 +231,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Drop.App.Core",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -240,7 +240,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Drop.Client",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -429,7 +429,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "ItemStore.Shared",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -1599,7 +1599,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.IdentityModel.Clients.ActiveDirectory",
"Version": "5.2.9"
"Version": "5.2.6"
}
}
},
@ -2328,7 +2328,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.ArtifactServices.Shared",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -2337,7 +2337,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.BlobStore.Client",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -2346,7 +2346,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.BlobStore.Client.Cache",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -2355,7 +2355,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.Client",
"Version": "19.208.0-internal202207122"
"Version": "16.199.0-internal202201091"
}
}
},
@ -2364,7 +2364,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.VisualStudio.Services.InteractiveClient",
"Version": "19.208.0-internal202207122"
"Version": "16.199.0-internal202201091"
}
}
},
@ -2958,7 +2958,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Symbol.App.Core",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},
@ -2967,7 +2967,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Symbol.Client",
"Version": "19.208.32712-buildid17682333"
"Version": "18.199.32109-buildid16662423"
}
}
},

2
config.dsc
Просмотреть файл

@ -233,7 +233,7 @@ config({
{ id: "Microsoft.NET.Test.Sdk", version: "15.9.0" },
{ id: "Microsoft.CodeCoverage", version: "15.9.0" },
{ id: "Microsoft.IdentityModel.Clients.ActiveDirectory", version: "5.2.9", /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
{ id: "Microsoft.IdentityModel.Clients.ActiveDirectory", version: "5.2.6", /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
dependentPackageIdsToSkip: ["Xamarin.Android.Support.CustomTabs", "Xamarin.Android.Support.v7.AppCompat"] },
{ id: "System.Private.Uri", version: "4.3.2" },

6
config.microsoftInternal.dsc
Просмотреть файл

@ -3,8 +3,8 @@
const isMicrosoftInternal = Environment.getFlag("[Sdk.BuildXL]microsoftInternal");
const artifactNugetVersion = "19.208.32712-buildid17682333";
const azureDevopsNugetVersion = "19.208.0-internal202207122";
const artifactNugetVersion = "18.199.32109-buildid16662423";
const azureDevopsNugetVersion = "16.199.0-internal202201091";
const sbomApiVersion = "2.1.35";
// These packages are Microsoft internal packages.
@ -33,7 +33,7 @@ export const pkgs = isMicrosoftInternal ? [
{ id: "WindowsSdk.Corext", version: "10.0.16299.1", alias: "Windows.Sdk", osSkip: [ "macOS", "unix" ] },
// Artifact packages and dependencies
{ id: "Microsoft.VisualStudio.Services.ArtifactServices.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "Microsoft.Azure.Cosmos.Table", "Microsoft.Azure.Storage.Blob", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext", "Mono.Unix" ] },
{ id: "Microsoft.VisualStudio.Services.ArtifactServices.Shared", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "Microsoft.Azure.Cosmos.Table", "Microsoft.Azure.Storage.Blob", "BuildXL.Utilities", "DotNetFxRefAssemblies.Corext" ] },
{ id: "Microsoft.VisualStudio.Services.BlobStore.Client", version: artifactNugetVersion, dependentPackageIdsToSkip: ["*"], dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing", "BuildXL.Cache.Interfaces", "DotNetFxRefAssemblies.Corext"] },
{ id: "Microsoft.VisualStudio.Services.Client", version: azureDevopsNugetVersion, dependentPackageIdsToSkip: [ "Microsoft.Net.Http", "Microsoft.AspNet.WebApi.Client", "System.Security.Cryptography.OpenSsl", "System.Security.Principal.Windows" ] },
{ id: "Microsoft.VisualStudio.Services.InteractiveClient", version: azureDevopsNugetVersion, dependentPackageIdsToSkip: [ "Ben.Demystifier" ], dependentPackageIdsToIgnore: [ "Ben.Demystifier" ] },