Skip to content

Commit a2080d1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 5.0.0-beta.20052.1 -> To Version 1.0.0-beta.20302.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent ef615ae commit a2080d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1477
-2446
lines changed

‎NuGet.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageRestore>
44
<add key="enabled" value="True" />
55
</packageRestore>
66
<packageSources>
7-
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
87
<clear />
9-
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
8+
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
9+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1010
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1111
<add key="vstest.myget" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
1212
<add key="nuint.myget" value="https://www.myget.org/F/nunit/api/v3/index.json" />
1313
<add key="xunit.myget" value="https://www.myget.org/F/xunit/api/v3/index.json" />
14-
<add key="mstest.myget" value="https://dotnet.myget.org/F/mstestv2/api/v3/index.json"/>
14+
<add key="mstest.myget" value="https://dotnet.myget.org/F/mstestv2/api/v3/index.json" />
1515
<add key="pdb2pdb.myget" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
16-
<add key="vsunittesting.myget" value="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json"/>
16+
<add key="vsunittesting.myget" value="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json" />
1717
</packageSources>
1818
<fallbackPackageFolders>
1919
<clear />

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20052.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20302.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
8+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20052.1">
10+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.20302.3">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
12+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20052.1">
14+
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.20302.3">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
16+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20052.1">
18+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20302.3">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
20+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="5.0.0-beta.20052.1">
22+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="1.0.0-beta.20302.3">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
24+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
2525
</Dependency>
2626
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
2727
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<XUnitVersion>2.4.1</XUnitVersion>
6161
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
6262
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
63-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20052.1</MicrosoftDotNetBuildTasksFeedVersion>
64-
<MicrosoftDotNetSignToolVersion>5.0.0-beta.20052.1</MicrosoftDotNetSignToolVersion>
63+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.20302.3</MicrosoftDotNetBuildTasksFeedVersion>
64+
<MicrosoftDotNetSignToolVersion>1.0.0-beta.20302.3</MicrosoftDotNetSignToolVersion>
6565
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
6666
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
6767
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -73,7 +73,7 @@
7373
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
7474
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.19556.4</MicrosoftDotNetMaestroClientVersion>
7575
<MicrosoftSourceLinkVersion>1.0.0-beta2-19554-01</MicrosoftSourceLinkVersion>
76-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>5.0.0-beta.20052.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
76+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.20302.3</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
7777
<XliffTasksVersion>1.0.0-beta.20055.1</XliffTasksVersion>
7878
</PropertyGroup>
7979
</Project>

‎eng/common/CheckSymbols.ps1‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ param(
55
)
66

77
Add-Type -AssemblyName System.IO.Compression.FileSystem
8-
. $PSScriptRoot\pipeline-logging-functions.ps1
98

109
function FirstMatchingSymbolDescriptionOrDefault {
1110
param(
1211
[string] $FullPath, # Full path to the module that has to be checked
13-
[string] $TargetServerParameter, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
12+
[string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
1413
[string] $SymbolsPath
1514
)
1615

@@ -22,36 +21,36 @@ function FirstMatchingSymbolDescriptionOrDefault {
2221
# checking and which type of file was uploaded.
2322

2423
# The file itself is returned
25-
$SymbolPath = $SymbolsPath + '\' + $FileName
24+
$SymbolPath = $SymbolsPath + "\" + $FileName
2625

2726
# PDB file for the module
28-
$PdbPath = $SymbolPath.Replace($Extension, '.pdb')
27+
$PdbPath = $SymbolPath.Replace($Extension, ".pdb")
2928

3029
# PDB file for R2R module (created by crossgen)
31-
$NGenPdb = $SymbolPath.Replace($Extension, '.ni.pdb')
30+
$NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb")
3231

3332
# DBG file for a .so library
34-
$SODbg = $SymbolPath.Replace($Extension, '.so.dbg')
33+
$SODbg = $SymbolPath.Replace($Extension, ".so.dbg")
3534

3635
# DWARF file for a .dylib
37-
$DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf')
36+
$DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
3837

39-
.\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParameter $FullPath -o $SymbolsPath | Out-Null
38+
.\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
4039

4140
if (Test-Path $PdbPath) {
42-
return 'PDB'
41+
return "PDB"
4342
}
4443
elseif (Test-Path $NGenPdb) {
45-
return 'NGen PDB'
44+
return "NGen PDB"
4645
}
4746
elseif (Test-Path $SODbg) {
48-
return 'DBG for SO'
47+
return "DBG for SO"
4948
}
5049
elseif (Test-Path $DylibDwarf) {
51-
return 'Dwarf for Dylib'
50+
return "Dwarf for Dylib"
5251
}
5352
elseif (Test-Path $SymbolPath) {
54-
return 'Module'
53+
return "Module"
5554
}
5655
else {
5756
return $null
@@ -69,15 +68,15 @@ function CountMissingSymbols {
6968
}
7069

7170
# Extensions for which we'll look for symbols
72-
$RelevantExtensions = @('.dll', '.exe', '.so', '.dylib')
71+
$RelevantExtensions = @(".dll", ".exe", ".so", ".dylib")
7372

7473
# How many files are missing symbol information
7574
$MissingSymbols = 0
7675

7776
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
7877
$PackageGuid = New-Guid
7978
$ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
80-
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols'
79+
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
8180

8281
[System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
8382

@@ -87,31 +86,31 @@ function CountMissingSymbols {
8786
Get-ChildItem -Recurse $ExtractPath |
8887
Where-Object {$RelevantExtensions -contains $_.Extension} |
8988
ForEach-Object {
90-
if ($_.FullName -Match '\\ref\\') {
89+
if ($_.FullName -Match "\\ref\\") {
9190
Write-Host "`t Ignoring reference assembly file" $_.FullName
9291
return
9392
}
9493

95-
$SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--microsoft-symbol-server' -SymbolsPath $SymbolsPath
96-
$SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--internal-server' -SymbolsPath $SymbolsPath
94+
$SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath
95+
$SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath
9796

9897
Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
9998

10099
if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
101-
Write-Host "Symbols found on MSDL (${$SymbolsOnMSDL}) and SymWeb (${$SymbolsOnSymWeb})"
100+
Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")"
102101
}
103102
else {
104103
$MissingSymbols++
105104

106105
if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
107-
Write-Host 'No symbols found on MSDL or SymWeb!'
106+
Write-Host "No symbols found on MSDL or SymWeb!"
108107
}
109108
else {
110109
if ($SymbolsOnMSDL -eq $null) {
111-
Write-Host 'No symbols found on MSDL!'
110+
Write-Host "No symbols found on MSDL!"
112111
}
113112
else {
114-
Write-Host 'No symbols found on SymWeb!'
113+
Write-Host "No symbols found on SymWeb!"
115114
}
116115
}
117116
}
@@ -130,26 +129,26 @@ function CheckSymbolsAvailable {
130129
Get-ChildItem "$InputPath\*.nupkg" |
131130
ForEach-Object {
132131
$FileName = $_.Name
133-
132+
134133
# These packages from Arcade-Services include some native libraries that
135134
# our current symbol uploader can't handle. Below is a workaround until
136135
# we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
137-
if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') {
136+
if ($FileName -Match "Microsoft\.DotNet\.Darc\.") {
138137
Write-Host "Ignoring Arcade-services file: $FileName"
139138
Write-Host
140139
return
141140
}
142-
elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') {
141+
elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") {
143142
Write-Host "Ignoring Arcade-services file: $FileName"
144143
Write-Host
145144
return
146145
}
147-
146+
148147
Write-Host "Validating $FileName "
149148
$Status = CountMissingSymbols "$InputPath\$FileName"
150149

151150
if ($Status -ne 0) {
152-
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName"
151+
Write-Error "Missing symbols for $Status modules in the package $FileName"
153152
}
154153

155154
Write-Host

‎eng/common/PublishToSymbolServers.proj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<PropertyGroup>
3838
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
3939
<PublishToSymbolServer>true</PublishToSymbolServer>
40-
<PublishToSymWeb Condition="'$(PublishToSymWeb)' == ''">true</PublishToSymWeb>
41-
<PublishToMSDL Condition="'$(PublishToMSDL)' == ''">true</PublishToMSDL>
4240
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
4341
</PropertyGroup>
4442

@@ -58,7 +56,7 @@
5856
DryRun="false"
5957
ConvertPortablePdbsToWindowsPdbs="false"
6058
PdbConversionTreatAsWarning=""
61-
Condition="$(PublishToSymbolServer) and $(PublishToMSDL)"/>
59+
Condition="$(PublishToSymbolServer)"/>
6260

6361
<!--
6462
Symbol Uploader: SymWeb
@@ -75,7 +73,7 @@
7573
DryRun="false"
7674
ConvertPortablePdbsToWindowsPdbs="false"
7775
PdbConversionTreatAsWarning=""
78-
Condition="$(PublishToSymbolServer) and $(PublishToSymWeb)"/>
76+
Condition="$(PublishToSymbolServer)"/>
7977
</Target>
8078

8179
<ItemGroup>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ if ($dotnet31Source -ne $null) {
140140
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
141141
}
142142

143-
$doc.Save($filename)
143+
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,4 @@ for FeedName in ${PackageSources[@]} ; do
146146

147147
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
148148
fi
149-
done
149+
done

0 commit comments

Comments
 (0)