huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'internal/release/5.0' into 'internal/release/5.0'

This commit is contained in:
Doug Bunting 2021-02-10 15:50:43 -08:00
parent f605914f4a 9d14b146e0
commit 357a302f40
No known key found for this signature in database
GPG Key ID: EE41520987982C03
9 changed files with 15790 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NuGet.config
View File

@ -6,7 +6,7 @@
<!-- Begin: Package sources from dotnet-efcore -->
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-1034492" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-1034492d/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-8a5d98f" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-8a5d98fb/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@ -20,14 +20,13 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-1034492" value="true" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="darc-int-dotnet-runtime-8a5d98f" value="true" />
<add key="darc-int-dotnet-runtime-d1e2874" value="true" />
<add key="darc-int-dotnet-runtime-c636bbd" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-efc2924" value="true" />
<add key="darc-int-dotnet-efcore-efc2924" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
</configuration>

12
eng/Version.Details.xml
View File

@ -313,17 +313,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d1e2874de3956c618626ee46554a093f28a330e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21063.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21109.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
<Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21063.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21109.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
<Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21063.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21109.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
<Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

2
eng/Versions.props
View File

@ -135,7 +135,7 @@
<MicrosoftEntityFrameworkCorePackageVersion>5.0.3</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21063.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21109.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<!--

13
eng/common/sdl/init-sdl.ps1
View File

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

2
eng/common/sdl/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
</packages>

2
eng/common/templates/job/execute-sdl.yml
View File

@ -83,7 +83,7 @@ jobs:
continueOnError: ${{ parameters.sdlContinueOnError }}
- ${{ if eq(parameters.overrideParameters, '') }}:
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
-GuardianPackageName Microsoft.Guardian.Cli.0.53.3
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
${{ parameters.additionalParameters }}

4
global.json
View File

@ -30,7 +30,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21063.3"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21109.6",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21109.6"
}
}

15928
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

20
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json
View File

@ -22,31 +22,35 @@
"@angular/platform-server": "8.2.12",
"@angular/router": "8.2.12",
"@nguniversal/module-map-ngfactory-loader": "8.1.1",
"bootstrap": "^4.3.1",
"core-js": "^3.3.3",
"bootstrap": "^4.6.0",
"core-js": "^3.8.3",
"jquery": "^3.5.1",
"oidc-client": "^1.9.1",
"node-sass": "^5.0.0",
"oidc-client": "^1.11.3",
"popper.js": "^1.16.0",
"rxjs": "^6.5.3",
"protractor": "~5.4.2",
"rxjs": "^6.6.3",
"ts-node": "~8.4.1",
"tslint": "~5.20.0",
"zone.js": "0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.29",
"@angular/cli": "^8.3.29",
"@angular/compiler-cli": "^8.2.14",
"@angular/language-service": "^8.2.12",
"@angular/language-service": "^8.2.14",
"@types/jasmine": "~3.4.4",
"@types/jasminewd2": "~2.0.8",
"@types/node": "~12.11.6",
"codelyzer": "^5.2.0",
"codelyzer": "^5.2.2",
"ini": "^1.3.7",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^5.0.2",
"karma": "^5.2.3",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"karma-jasmine-html-reporter": "^1.5.4",
"typescript": "3.5.3"
},
"optionalDependencies": {