Skip to content

Commit 1de5649

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220729.10 (#6858)
[main] Update dependencies from dotnet/arcade
1 parent 5b4311f commit 1de5649

File tree

8 files changed

+71
-68
lines changed

8 files changed

+71
-68
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22378.16">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22379.10">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
80+
<Sha>1e73f4ab4c172aa55614f24b2d5c319e1efb8813</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22378.16">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22379.10">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
84+
<Sha>1e73f4ab4c172aa55614f24b2d5c319e1efb8813</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22378.16">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22379.10">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
88+
<Sha>1e73f4ab4c172aa55614f24b2d5c319e1efb8813</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22378.16">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22379.10">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
92+
<Sha>1e73f4ab4c172aa55614f24b2d5c319e1efb8813</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22378.16">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22379.10">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
96+
<Sha>1e73f4ab4c172aa55614f24b2d5c319e1efb8813</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
</PropertyGroup>
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
51-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22378.16</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22378.16</MicrosoftDotNetCodeAnalysisPackageVersion>
51+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22379.10</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22379.10</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5555
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎eng/common/SetupNugetSources.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,22 @@ $userName = "dn-bot"
146146
# Insert credential nodes for Maestro's private feeds
147147
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
148148

149+
# 3.1 uses a different feed url format so it's handled differently here
149150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
150151
if ($dotnet31Source -ne $null) {
151152
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
152153
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
153154
}
154155

155-
$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
156-
if ($dotnet5Source -ne $null) {
157-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
158-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
159-
}
156+
$dotnetVersions = @('5','6','7')
160157

161-
$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
162-
if ($dotnet6Source -ne $null) {
163-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
164-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
158+
foreach ($dotnetVersion in $dotnetVersions) {
159+
$feedPrefix = "dotnet" + $dotnetVersion;
160+
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161+
if ($dotnetSource -ne $null) {
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
164+
}
165165
}
166166

167167
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -105,53 +105,33 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
109-
grep -i "<add key=\"dotnet5\"" $ConfigFile
110-
if [ "$?" == "0" ]; then
111-
grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
112-
if [ "$?" != "0" ]; then
113-
echo "Adding dotnet5-internal to the packageSources."
114-
PackageSourcesNodeFooter="</packageSources>"
115-
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
116-
117-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
118-
fi
119-
PackageSources+=('dotnet5-internal')
120-
121-
grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
122-
if [ "$?" != "0" ]; then
123-
echo "Adding dotnet5-internal-transport to the packageSources."
124-
PackageSourcesNodeFooter="</packageSources>"
125-
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
126-
127-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
128-
fi
129-
PackageSources+=('dotnet5-internal-transport')
130-
fi
131-
132-
# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
133-
grep -i "<add key=\"dotnet6\"" $ConfigFile
134-
if [ "$?" == "0" ]; then
135-
grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
136-
if [ "$?" != "0" ]; then
137-
echo "Adding dotnet6-internal to the packageSources."
138-
PackageSourcesNodeFooter="</packageSources>"
139-
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
108+
DotNetVersions=('5' '6' '7')
109+
110+
for DotNetVersion in ${DotNetVersions[@]} ; do
111+
FeedPrefix="dotnet${DotNetVersion}";
112+
grep -i "<add key=\"$FeedPrefix\"" $ConfigFile
113+
if [ "$?" == "0" ]; then
114+
grep -i "<add key=\"$FeedPrefix-internal\"" $ConfigFile
115+
if [ "$?" != "0" ]; then
116+
echo "Adding $FeedPrefix-internal to the packageSources."
117+
PackageSourcesNodeFooter="</packageSources>"
118+
PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/v2\" />"
119+
120+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
121+
fi
122+
PackageSources+=("$FeedPrefix-internal")
140123

141-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
142-
fi
143-
PackageSources+=('dotnet6-internal')
124+
grep -i "<add key=\"$FeedPrefix-internal-transport\">" $ConfigFile
125+
if [ "$?" != "0" ]; then
126+
echo "Adding $FeedPrefix-internal-transport to the packageSources."
127+
PackageSourcesNodeFooter="</packageSources>"
128+
PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/v2\" />"
144129

145-
grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
146-
if [ "$?" != "0" ]; then
147-
echo "Adding dotnet6-internal-transport to the packageSources."
148-
PackageSourcesNodeFooter="</packageSources>"
149-
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
150-
151-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
130+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
131+
fi
132+
PackageSources+=("$FeedPrefix-internal-transport")
152133
fi
153-
PackageSources+=('dotnet6-internal-transport')
154-
fi
134+
done
155135

156136
# I want things split line by line
157137
PrevIFS=$IFS

‎eng/common/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
74+
if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

‎eng/common/templates/post-build/post-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ parameters:
4949
type: object
5050
default:
5151
enable: false
52+
publishGdn: false
5253
continueOnError: false
5354
params: ''
5455
artifactNames: ''
@@ -235,6 +236,7 @@ stages:
235236
- template: /eng/common/templates/job/execute-sdl.yml
236237
parameters:
237238
enable: ${{ parameters.SDLValidationParameters.enable }}
239+
publishGuardianDirectoryToPipeline: ${{ parameters.SDLValidationParameters.publishGdn }}
238240
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
239241
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
240242
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}

‎eng/common/templates/steps/execute-sdl.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,28 @@ steps:
6262
c
6363
i
6464
condition: succeededOrFailed()
65+
6566
- publish: $(Agent.BuildDirectory)/.gdn
6667
artifact: GuardianConfiguration
6768
displayName: Publish GuardianConfiguration
69+
condition: succeededOrFailed()
70+
71+
# Publish the SARIF files in a container named CodeAnalysisLogs to enable integration
72+
# with the "SARIF SAST Scans Tab" Azure DevOps extension
73+
- task: CopyFiles@2
74+
displayName: Copy SARIF files
75+
inputs:
76+
flattenFolders: true
77+
sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/
78+
contents: '**/*.sarif'
79+
targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs
80+
condition: succeededOrFailed()
81+
82+
# Use PublishBuildArtifacts because the SARIF extension only checks this case
83+
# see microsoft/sarif-azuredevops-extension#4
84+
- task: PublishBuildArtifacts@1
85+
displayName: Publish SARIF files to CodeAnalysisLogs container
86+
inputs:
87+
pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs
88+
artifactName: CodeAnalysisLogs
6889
condition: succeededOrFailed()

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22378.16",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22378.16"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22379.10",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22379.10"
1717
},
1818
"sdk": {
1919
"version": "7.0.100-preview.5.22307.18"

0 commit comments

Comments
 (0)