Skip to content

Commit 5cfe1b0

Browse files
dsplaisteddsplaisted
authored
Merge branch 'release/5.0.3xx' into exe-reference-selfcontained-mismatch-error
2 parents 51532b2 + 5055752 commit 5cfe1b0

File tree

393 files changed

+11431
-1262
lines changed

Some content is hidden

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

393 files changed

+11431
-1262
lines changed

‎CODEOWNERS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,9 @@
2525
/src/Cli/dotnet/commands/dotnet-new @DonJoseLuis
2626
/src/Tests/dotnet-new.Tests @DonJoseLuis
2727

28-
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
28+
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
29+
30+
/src/Assets/TestProjects/Watch* @captainsafia, @pranavkm, @mkArtakMSFT
31+
/src/Tests/dotnet-watch.Tests @captainsafia, @pranavkm, @mkArtakMSFT
32+
/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests @captainsafia, @pranavkm, mkArtakMSFT
33+
/src/BuiltInTools/ @captainsafia, @pranavkm, mkArtakMSFT

‎Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
1818

1919
<!-- <ArtifactsShippingSymbolsDir>$(ArtifactsDir)symbols\$(Configuration)\Shipping</ArtifactsShippingSymbolsDir> -->
20+
21+
<DefineConstants Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(DefineConstants);CI_BUILD</DefineConstants>
2022
</PropertyGroup>
2123

2224
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">

‎NuGet.config

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
7-
<add key="darc-pub-dotnet-roslyn-analyzers-7f956e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-7f956e6b/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-roslyn-analyzers-3c1d0c4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-3c1d0c48-1/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-roslyn-analyzers-3c1d0c4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-3c1d0c48/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-roslyn-analyzers -->
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
1112
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
12-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
13+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1314
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1415
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1516
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
16-
<add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
17-
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1817
</packageSources>
19-
<disabledPackageSources />
18+
<disabledPackageSources>
19+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
20+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
21+
</disabledPackageSources>
2022
</configuration>

‎eng/Version.Details.xml

Lines changed: 114 additions & 106 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<!-- Repo Version Information -->
99
<PropertyGroup>
10-
<VersionPrefix>5.0.200</VersionPrefix>
10+
<VersionPrefix>5.0.300</VersionPrefix>
1111
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1212
</PropertyGroup>
1313
<!-- Production Dependencies -->
@@ -21,9 +21,10 @@
2121
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
2222
<NewtonsoftJsonPackageVersion>11.0.1</NewtonsoftJsonPackageVersion>
2323
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
24+
<SystemCommandLineVersion>2.0.0-beta1.20574.7</SystemCommandLineVersion>
2425
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
2526
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
26-
<MicrosoftDotNetSignToolVersion>5.0.0-beta.20580.4</MicrosoftDotNetSignToolVersion>
27+
<MicrosoftDotNetSignToolVersion>5.0.0-beta.21160.3</MicrosoftDotNetSignToolVersion>
2728
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
2829
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
2930
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -34,17 +35,17 @@
3435
<PropertyGroup>
3536
<!-- Dependencies from https://github.com/dotnet/runtime -->
3637
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
37-
<MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreAppInternalPackageVersion>
38-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
38+
<MicrosoftNETCoreAppInternalPackageVersion>5.0.5-servicing.21166.9</MicrosoftNETCoreAppInternalPackageVersion>
39+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
3940
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
4041
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
41-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
42-
<MicrosoftNETHostModelVersion>5.0.1-servicing.20575.16</MicrosoftNETHostModelVersion>
42+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
43+
<MicrosoftNETHostModelVersion>5.0.5-servicing.21166.9</MicrosoftNETHostModelVersion>
4344
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
4445
</PropertyGroup>
4546
<PropertyGroup>
4647
<!-- Dependencies from https://github.com/nuget/nuget.client -->
47-
<NuGetBuildTasksPackageVersion>5.9.0-preview.3.6981</NuGetBuildTasksPackageVersion>
48+
<NuGetBuildTasksPackageVersion>5.10.0-preview.2.7203</NuGetBuildTasksPackageVersion>
4849
<NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
4950
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
5051
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
@@ -60,13 +61,13 @@
6061
</PropertyGroup>
6162
<PropertyGroup>
6263
<!-- Dependencies from https://github.com/Microsoft/vstest -->
63-
<MicrosoftNETTestSdkPackageVersion>16.9.0-release-20201130-02</MicrosoftNETTestSdkPackageVersion>
64+
<MicrosoftNETTestSdkPackageVersion>16.9.1-release-20210308-01</MicrosoftNETTestSdkPackageVersion>
6465
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
6566
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
6667
</PropertyGroup>
6768
<PropertyGroup>
6869
<!-- Dependencies from https://github.com/mono/linker -->
69-
<MicrosoftNETILLinkTasksPackageVersion>5.0.0-rtm.20604.1</MicrosoftNETILLinkTasksPackageVersion>
70+
<MicrosoftNETILLinkTasksPackageVersion>5.0.0-rtm.21213.1</MicrosoftNETILLinkTasksPackageVersion>
7071
</PropertyGroup>
7172
<PropertyGroup>
7273
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -81,10 +82,10 @@
8182
</PropertyGroup>
8283
<PropertyGroup>
8384
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
84-
<MicrosoftBuildPackageVersion>16.9.0-preview-20623-01</MicrosoftBuildPackageVersion>
85+
<MicrosoftBuildPackageVersion>16.10.0-preview-21215-05</MicrosoftBuildPackageVersion>
8586
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
8687
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
87-
<MicrosoftBuildLocalizationPackageVersion>16.9.0-preview-20623-01</MicrosoftBuildLocalizationPackageVersion>
88+
<MicrosoftBuildLocalizationPackageVersion>16.10.0-preview-21215-05</MicrosoftBuildLocalizationPackageVersion>
8889
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
8990
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
9091
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
@@ -96,38 +97,39 @@
9697
</PropertyGroup>
9798
<PropertyGroup>
9899
<!-- Dependencies from https://github.com/dotnet/templating -->
99-
<MicrosoftTemplateEngineCliPackageVersion>5.0.1-servicing.20576.3</MicrosoftTemplateEngineCliPackageVersion>
100-
<MicrosoftTemplateEngineAbstractionsPackageVersion>5.0.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
101-
<MicrosoftTemplateEngineCliLocalizationPackageVersion>5.0.1-servicing.20576.3</MicrosoftTemplateEngineCliLocalizationPackageVersion>
102-
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>5.0.1</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
103-
<MicrosoftTemplateEngineUtilsPackageVersion>5.0.1</MicrosoftTemplateEngineUtilsPackageVersion>
104-
<MicrosoftTemplateSearchCommonPackageVersion>5.0.1</MicrosoftTemplateSearchCommonPackageVersion>
100+
<MicrosoftTemplateEngineCliPackageVersion>5.0.300-preview.21214.2</MicrosoftTemplateEngineCliPackageVersion>
101+
<MicrosoftTemplateEngineAbstractionsPackageVersion>5.0.300-preview.21214.2</MicrosoftTemplateEngineAbstractionsPackageVersion>
102+
<MicrosoftTemplateEngineCliLocalizationPackageVersion>5.0.300-preview.21159.1</MicrosoftTemplateEngineCliLocalizationPackageVersion>
103+
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>5.0.300-preview.21214.2</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
104+
<MicrosoftTemplateEngineUtilsPackageVersion>5.0.300-preview.21214.2</MicrosoftTemplateEngineUtilsPackageVersion>
105+
<MicrosoftTemplateSearchCommonPackageVersion>5.0.300-preview.21214.2</MicrosoftTemplateSearchCommonPackageVersion>
105106
</PropertyGroup>
106107
<PropertyGroup>
107108
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
108-
<MicrosoftFSharpCompilerPackageVersion>11.0.0-beta.20627.2</MicrosoftFSharpCompilerPackageVersion>
109+
<MicrosoftFSharpCompilerPackageVersion>11.4.2-beta.21220.2</MicrosoftFSharpCompilerPackageVersion>
109110
</PropertyGroup>
110111
<PropertyGroup>
111112
<!-- Dependencies from https://github.com/dotnet/roslyn -->
112-
<MicrosoftNetCompilersToolsetPackageVersion>3.9.0-3.20619.14</MicrosoftNetCompilersToolsetPackageVersion>
113+
<MicrosoftNetCompilersToolsetPackageVersion>3.10.0-3.21216.10</MicrosoftNetCompilersToolsetPackageVersion>
113114
</PropertyGroup>
114115
<PropertyGroup>
115116
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
116-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>5.0.1-servicing.20601.7</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
117-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>5.0.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
118-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>5.0.1-servicing.20601.7</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
119-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>5.0.1-servicing.20601.7</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
120-
<MicrosoftAspNetCoreAnalyzersPackageVersion>5.0.1-servicing.20601.7</MicrosoftAspNetCoreAnalyzersPackageVersion>
121-
<MicrosoftNETSdkRazorPackageVersion>5.0.1-servicing.20601.7</MicrosoftNETSdkRazorPackageVersion>
122-
<MicrosoftNETSdkBlazorWebAssemblyPackageVersion>5.0.1-servicing.20601.7</MicrosoftNETSdkBlazorWebAssemblyPackageVersion>
117+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>5.0.5-servicing.21167.8</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
118+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>5.0.5</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
119+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>5.0.5-servicing.21167.8</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
120+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>5.0.5-servicing.21167.8</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
121+
<MicrosoftAspNetCoreAnalyzersPackageVersion>5.0.5-servicing.21167.8</MicrosoftAspNetCoreAnalyzersPackageVersion>
122+
<MicrosoftAspNetCoreTestHostPackageVersion>5.0.5</MicrosoftAspNetCoreTestHostPackageVersion>
123+
<MicrosoftNETSdkRazorPackageVersion>5.0.5-servicing.21167.8</MicrosoftNETSdkRazorPackageVersion>
124+
<MicrosoftNETSdkBlazorWebAssemblyPackageVersion>5.0.5-servicing.21167.8</MicrosoftNETSdkBlazorWebAssemblyPackageVersion>
123125
</PropertyGroup>
124126
<PropertyGroup>
125127
<!-- Dependencies from https://github.com/dotnet/wpf -->
126-
<MicrosoftNETSdkWindowsDesktopPackageVersion>5.0.1-servicing.20580.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
128+
<MicrosoftNETSdkWindowsDesktopPackageVersion>5.0.5-servicing.21167.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
127129
</PropertyGroup>
128130
<PropertyGroup>
129131
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
130-
<MicrosoftWindowsDesktopAppVersion>5.0.1-servicing.20580.3</MicrosoftWindowsDesktopAppVersion>
132+
<MicrosoftWindowsDesktopAppVersion>5.0.5-servicing.21167.2</MicrosoftWindowsDesktopAppVersion>
131133
</PropertyGroup>
132134
<!-- Get .NET Framework reference assemblies from NuGet packages -->
133135
<PropertyGroup>
@@ -137,7 +139,8 @@
137139
<PropertyGroup>
138140
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
139141
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
140-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20580.4</MicrosoftDotNetXUnitExtensionsVersion>
142+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21160.3</MicrosoftDotNetXUnitExtensionsVersion>
143+
<MoqPackageVersion>4.8.2</MoqPackageVersion>
141144
</PropertyGroup>
142145
<PropertyGroup>
143146
<ExeExtension>.exe</ExeExtension>

‎eng/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ jobs:
3737
- _PublishArgs: ''
3838
- _SignArgs: ''
3939
- _InternalRuntimeDownloadArgs: ''
40+
- _HelixApiToken: ''
41+
# Helix Testing requires a token when internally run
42+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
43+
- group: DotNet-HelixApi-Access
44+
- _HelixApiToken: $(HelixApiAccessToken)
4045
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
4146
- group: DotNet-Symbol-Server-PATs
42-
- group: DotNet-HelixApi-Access
4347
- group: dotnet-benchview
4448
- group: DotNet-Blob-Feed
4549
- _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
@@ -170,7 +174,7 @@ jobs:
170174
condition: succeededOrFailed()
171175
env:
172176
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
173-
HelixAccessToken: ''
177+
HelixAccessToken: $(_HelixApiToken)
174178

175179
- task: PublishTestResults@2
176180
displayName: Publish Test Results

‎eng/common/SetupNugetSources.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,9 @@ if ($dotnet5Source -ne $null) {
158158
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
159159
}
160160

161+
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
162+
if ($dotnetToolsSource -ne $null) {
163+
AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
164+
}
165+
161166
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,20 @@ if [ "$?" == "0" ]; then
129129
PackageSources+=('dotnet5-internal-transport')
130130
fi
131131

132+
# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present
133+
grep -i "<add key=\"dotnet-tools\"" $ConfigFile
134+
if [ "$?" == "0" ]; then
135+
grep -i "<add key=\"dotnet-tools-internal\"" $ConfigFile
136+
if [ "$?" != "0" ]; then
137+
echo "Adding dotnet-tools-internal to the packageSources."
138+
PackageSourcesNodeFooter="</packageSources>"
139+
PackageSourceTemplate="${TB}<add key=\"dotnet-tools-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2\" />"
140+
141+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
142+
fi
143+
PackageSources+=('dotnet-tools-internal')
144+
fi
145+
132146
# I want things split line by line
133147
PrevIFS=$IFS
134148
IFS=$'\n'

‎eng/common/internal-feed-operations.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ function SetupCredProvider {
6363
}
6464

6565
if (($endpoints | Measure-Object).Count -gt 0) {
66-
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")]
67-
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6866
$endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress
6967

7068
# Create the environment variables the AzDo way

‎eng/common/internal-feed-operations.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ function SetupCredProvider {
6262
endpoints+=']'
6363

6464
if [ ${#endpoints} -gt 2 ]; then
65-
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")]
66-
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6765
local endpointCredentials="{\"endpointCredentials\": "$endpoints"}"
6866

6967
echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials"

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ try {
5454
--id $buildId `
5555
--publishing-infra-version $PublishingInfraVersion `
5656
--default-channels `
57-
--source-branch master `
57+
--source-branch main `
5858
--azdev-pat $AzdoToken `
5959
--bar-uri $MaestroApiEndPoint `
6060
--password $MaestroToken `

‎eng/common/sdl/init-sdl.ps1

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ $zipFile = "$WorkingDirectory/gdn.zip"
2929

3030
Add-Type -AssemblyName System.IO.Compression.FileSystem
3131
$gdnFolder = (Join-Path $WorkingDirectory '.gdn')
32-
try {
33-
# We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead
34-
Write-Host 'Downloading gdn folder from internal config repostiory...'
35-
Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile
36-
if (Test-Path $gdnFolder) {
37-
# Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case)
38-
Remove-Item -Force -Recurse $gdnFolder
39-
}
40-
[System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory)
41-
Write-Host $gdnFolder
42-
ExitWithExitCode 0
43-
} catch [System.Net.WebException] { } # Catch and ignore webexception
32+
4433
try {
4534
# if the folder does not exist, we'll do a guardian init and push it to the remote repository
4635
Write-Host 'Initializing Guardian...'

‎eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
44
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
continueOnError: ${{ parameters.sdlContinueOnError }}
8484
- ${{ if eq(parameters.overrideParameters, '') }}:
8585
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
86-
-GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
86+
-GuardianPackageName Microsoft.Guardian.Cli.0.53.3
8787
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
8888
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
8989
${{ parameters.additionalParameters }}

0 commit comments

Comments
 (0)