Merged PR 9296: [internal/release/5.0-preview8] Update dependencies from dnceng/internal/dotnet-runtime
This pull request updates the following dependencies [marker]: <> (Begin:2f3f3ff0-d34f-49bd-50aa-08d828f9655f) ## From https://github.com/dotnet/runtime - **Subscription**: 2f3f3ff0-d34f-49bd-50aa-08d828f9655f - **Build**: 20200722.7 - **Date Produced**: 7/23/2020 12:04 AM - **Commit**: 3cab6dd440a5f3763bfbd2d582b36fe51095686a - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Diagnostics.DiagnosticSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.Diagnostics.EventLog**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.Drawing.Common**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.IO.Pipelines**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.ComponentModel.Annotations**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Configuration**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Console**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Debug**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.EventLog**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.EventSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.TraceSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options.ConfigurationExtensions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options.DataAnnotations**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Primitives**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Internal.Transport**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Hosting.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Caching.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Caching.Memory**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.Binder**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.CommandLine**: from 5.0.0-preview.8.203...
This commit is contained in:
parent
21a5f39a15
commit
cba2275799
|
|
@ -607,17 +607,18 @@ stages:
|
|||
timeoutInMinutes: 180
|
||||
steps:
|
||||
# Build the shared framework
|
||||
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
|
||||
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
|
||||
displayName: Build shared fx
|
||||
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
|
||||
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj $(_InternalRuntimeDownloadArgs)
|
||||
displayName: Restore interop projects
|
||||
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
|
||||
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
|
||||
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true $(_InternalRuntimeDownloadArgs)
|
||||
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
|
||||
displayName: Run build.cmd helix target
|
||||
env:
|
||||
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
|
||||
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
|
||||
|
||||
artifacts:
|
||||
- name: Helix_logs
|
||||
path: artifacts/log/
|
||||
|
|
@ -651,7 +652,7 @@ stages:
|
|||
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
|
||||
env:
|
||||
Token: $(dn-bot-dnceng-artifact-feeds-rw)
|
||||
- script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
|
||||
- script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false $(_InternalRuntimeDownloadArgs)
|
||||
displayName: Run ci-source-build.sh
|
||||
- task: PublishBuildArtifacts@1
|
||||
displayName: Upload logs
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<add key="darc-pub-dotnet-blazor-cc44960" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-blazor-cc449601/nuget/v3/index.json" />
|
||||
<!--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" />
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
|
||||
|
|
|
|||
|
|
@ -41,264 +41,264 @@
|
|||
<Uri>https://github.com/dotnet/efcore</Uri>
|
||||
<Sha>58abc390e0e3eb849b5773da3f5ed2982ade521d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.IO.Pipelines" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.IO.Pipelines" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Net.Http.Json" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Net.Http.Json" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Reflection.Metadata" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Reflection.Metadata" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Json" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Text.Json" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Threading.Channels" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Threading.Channels" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<!--
|
||||
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
|
||||
All Runtime.$rid packages should have the same version.
|
||||
-->
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.8.20361.2">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.8.20372.7">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>f37dd6fc8595e130909dcb3085a56342d04aa20c</Sha>
|
||||
<Sha>3cab6dd440a5f3763bfbd2d582b36fe51095686a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20364.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
|
|
|
|||
|
|
@ -64,70 +64,70 @@
|
|||
<!-- Packages from dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>3.8.0-1.20361.1</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<!-- Packages from dotnet/runtime -->
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.8.20361.2</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.8.20361.2</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.8.20361.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.8.20361.2</MicrosoftWin32RegistryPackageVersion>
|
||||
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftWin32SystemEventsPackageVersion>
|
||||
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsCachingAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsCachingMemoryPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationBinderPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
|
||||
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationIniPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsConfigurationXmlPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsFileProvidersCompositePackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
|
||||
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
|
||||
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
|
||||
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsHostingAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsHostingPackageVersion>
|
||||
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsHttpPackageVersion>
|
||||
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingConfigurationPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingConsolePackageVersion>
|
||||
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingDebugPackageVersion>
|
||||
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingEventSourcePackageVersion>
|
||||
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingEventLogPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
|
||||
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
|
||||
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsOptionsPackageVersion>
|
||||
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsPrimitivesPackageVersion>
|
||||
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-preview.8.20361.2</MicrosoftExtensionsInternalTransportPackageVersion>
|
||||
<SystemComponentModelAnnotationsPackageVersion>5.0.0-preview.8.20361.2</SystemComponentModelAnnotationsPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-preview.8.20361.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.8.20361.2</SystemDiagnosticsEventLogPackageVersion>
|
||||
<SystemDrawingCommonPackageVersion>5.0.0-preview.8.20361.2</SystemDrawingCommonPackageVersion>
|
||||
<SystemIOPipelinesPackageVersion>5.0.0-preview.8.20361.2</SystemIOPipelinesPackageVersion>
|
||||
<SystemNetHttpJsonPackageVersion>5.0.0-preview.8.20361.2</SystemNetHttpJsonPackageVersion>
|
||||
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.8.20361.2</SystemNetHttpWinHttpHandlerPackageVersion>
|
||||
<SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.8.20361.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>5.0.0-preview.8.20361.2</SystemReflectionMetadataPackageVersion>
|
||||
<SystemResourcesExtensionsPackageVersion>5.0.0-preview.8.20361.2</SystemResourcesExtensionsPackageVersion>
|
||||
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.8.20361.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
|
||||
<SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.8.20361.2</SystemSecurityCryptographyCngPackageVersion>
|
||||
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.8.20361.2</SystemSecurityCryptographyPkcsPackageVersion>
|
||||
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.8.20361.2</SystemSecurityCryptographyXmlPackageVersion>
|
||||
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.8.20361.2</SystemSecurityPermissionsPackageVersion>
|
||||
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.8.20361.2</SystemSecurityPrincipalWindowsPackageVersion>
|
||||
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-preview.8.20361.2</SystemServiceProcessServiceControllerPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>5.0.0-preview.8.20361.2</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemTextJsonPackageVersion>5.0.0-preview.8.20361.2</SystemTextJsonPackageVersion>
|
||||
<SystemThreadingChannelsPackageVersion>5.0.0-preview.8.20361.2</SystemThreadingChannelsPackageVersion>
|
||||
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.8.20361.2</SystemWindowsExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.8.20372.7</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.8.20372.7</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.8.20372.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.8.20372.7</MicrosoftWin32RegistryPackageVersion>
|
||||
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftWin32SystemEventsPackageVersion>
|
||||
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsCachingAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsCachingMemoryPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationBinderPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
|
||||
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationIniPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsConfigurationXmlPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsDependencyInjectionPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsFileProvidersCompositePackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
|
||||
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
|
||||
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
|
||||
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsHostingAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsHostingPackageVersion>
|
||||
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsHttpPackageVersion>
|
||||
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingConfigurationPackageVersion>
|
||||
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingConsolePackageVersion>
|
||||
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingDebugPackageVersion>
|
||||
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingEventSourcePackageVersion>
|
||||
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingEventLogPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
|
||||
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
|
||||
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsOptionsPackageVersion>
|
||||
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsPrimitivesPackageVersion>
|
||||
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-preview.8.20372.7</MicrosoftExtensionsInternalTransportPackageVersion>
|
||||
<SystemComponentModelAnnotationsPackageVersion>5.0.0-preview.8.20372.7</SystemComponentModelAnnotationsPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-preview.8.20372.7</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.8.20372.7</SystemDiagnosticsEventLogPackageVersion>
|
||||
<SystemDrawingCommonPackageVersion>5.0.0-preview.8.20372.7</SystemDrawingCommonPackageVersion>
|
||||
<SystemIOPipelinesPackageVersion>5.0.0-preview.8.20372.7</SystemIOPipelinesPackageVersion>
|
||||
<SystemNetHttpJsonPackageVersion>5.0.0-preview.8.20372.7</SystemNetHttpJsonPackageVersion>
|
||||
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.8.20372.7</SystemNetHttpWinHttpHandlerPackageVersion>
|
||||
<SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.8.20372.7</SystemNetWebSocketsWebSocketProtocolPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>5.0.0-preview.8.20372.7</SystemReflectionMetadataPackageVersion>
|
||||
<SystemResourcesExtensionsPackageVersion>5.0.0-preview.8.20372.7</SystemResourcesExtensionsPackageVersion>
|
||||
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.8.20372.7</SystemRuntimeCompilerServicesUnsafePackageVersion>
|
||||
<SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.8.20372.7</SystemSecurityCryptographyCngPackageVersion>
|
||||
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.8.20372.7</SystemSecurityCryptographyPkcsPackageVersion>
|
||||
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.8.20372.7</SystemSecurityCryptographyXmlPackageVersion>
|
||||
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.8.20372.7</SystemSecurityPermissionsPackageVersion>
|
||||
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.8.20372.7</SystemSecurityPrincipalWindowsPackageVersion>
|
||||
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-preview.8.20372.7</SystemServiceProcessServiceControllerPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>5.0.0-preview.8.20372.7</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemTextJsonPackageVersion>5.0.0-preview.8.20372.7</SystemTextJsonPackageVersion>
|
||||
<SystemThreadingChannelsPackageVersion>5.0.0-preview.8.20372.7</SystemThreadingChannelsPackageVersion>
|
||||
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.8.20372.7</SystemWindowsExtensionsPackageVersion>
|
||||
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-preview.8.20361.2</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-preview.8.20372.7</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<!-- Packages from dotnet/blazor -->
|
||||
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
|
||||
<!-- Packages from dotnet/efcore -->
|
||||
|
|
@ -155,7 +155,6 @@
|
|||
-->
|
||||
<MicrosoftNETCoreAppRuntimeVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimeVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
We ship ref/ assemblies for runtime packages in our targeting targeting pack. When servicing that targeting pack,
|
||||
these assemblies must not change. Must also compile our assemblies against the initial ref/ assemblies for runtime
|
||||
|
|
@ -178,7 +177,6 @@
|
|||
<SystemSecurityPrincipalWindowsV0PackageVersion>$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[0]).$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[1]).0</SystemSecurityPrincipalWindowsV0PackageVersion>
|
||||
<SystemWindowsExtensionsV0PackageVersion>$(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0</SystemWindowsExtensionsV0PackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="Manual">
|
||||
<!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated -->
|
||||
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.4.20180.4</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
<#
|
||||
.SYNOPSIS
|
||||
Installs dotnet sdk and runtime using https://dot.net/v1/dotnet-install.ps1
|
||||
.DESCRIPTION
|
||||
Installs dotnet sdk and runtime using https://dot.net/v1/dotnet-install.ps1
|
||||
.PARAMETER arch
|
||||
The architecture to install.
|
||||
.PARAMETER sdkVersion
|
||||
The sdk version to install
|
||||
.PARAMETER runtimeVersion
|
||||
The runtime version to install
|
||||
.PARAMETER installDir
|
||||
The directory to install to
|
||||
#>
|
||||
param(
|
||||
[Parameter(Mandatory = $true)]
|
||||
$arch,
|
||||
|
||||
[Parameter(Mandatory = $true)]
|
||||
$sdkVersion,
|
||||
|
||||
[Parameter(Mandatory = $true)]
|
||||
$runtimeVersion,
|
||||
|
||||
[Parameter(Mandatory = $true)]
|
||||
$installDir
|
||||
)
|
||||
|
||||
& $PSScriptRoot\Download.ps1 "https://dot.net/v1/dotnet-install.ps1" $PSScriptRoot\dotnet-install.ps1
|
||||
Write-Host "Download of dotnet-install.ps1 complete..."
|
||||
Write-Host "Installing SDK...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir"
|
||||
Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir"
|
||||
Write-Host "Installing Runtime...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir"
|
||||
Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir"
|
||||
Write-Host "InstallDotNet.ps1 complete..."
|
||||
|
|
@ -15,6 +15,8 @@ set $aspnetref=%9
|
|||
REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
|
||||
shift
|
||||
set $helixTimeout=%9
|
||||
shift
|
||||
set $feedCred=%9
|
||||
|
||||
set DOTNET_HOME=%HELIX_CORRELATION_PAYLOAD%\sdk
|
||||
set DOTNET_ROOT=%DOTNET_HOME%\%$arch%
|
||||
|
|
@ -24,10 +26,16 @@ set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home
|
|||
|
||||
set PATH=%DOTNET_ROOT%;!PATH!;%HELIX_CORRELATION_PAYLOAD%\node\bin
|
||||
echo Set path to: %PATH%
|
||||
echo "Invoking InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT%"
|
||||
powershell.exe -NoProfile -ExecutionPolicy unrestricted -file InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT%
|
||||
|
||||
powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$sdkVersion% %$arch% '' $true"
|
||||
IF [%$feedCred%] == [] (
|
||||
powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true"
|
||||
) else (
|
||||
powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true https://dotnetclimsrc.blob.core.windows.net/dotnet %$feedCred%"
|
||||
)
|
||||
|
||||
set exit_code=0
|
||||
|
||||
echo "Restore: dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources..."
|
||||
dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources
|
||||
|
||||
|
|
|
|||
|
|
@ -30,49 +30,24 @@ RED="\033[0;31m"
|
|||
YELLOW="\033[0;33m"
|
||||
MAGENTA="\033[0;95m"
|
||||
|
||||
curl -o dotnet-install.sh -sSL https://dot.net/v1/dotnet-install.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
download_retries=3
|
||||
while [ $download_retries -gt 0 ]; do
|
||||
curl -o dotnet-install.sh -sSL https://dot.net/v1/dotnet-install.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
let download_retries=download_retries-1
|
||||
echo -e "${YELLOW}Failed to download dotnet-install.sh. Retries left: $download_retries.${RESET}"
|
||||
else
|
||||
download_retries=0
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
|
||||
chmod +x "dotnet-install.sh"; sync
|
||||
|
||||
./dotnet-install.sh --version $dotnet_sdk_version --install-dir "$DOTNET_ROOT"
|
||||
if [ $? -ne 0 ]; then
|
||||
sdk_retries=3
|
||||
while [ $sdk_retries -gt 0 ]; do
|
||||
./dotnet-install.sh --version $dotnet_sdk_version --install-dir "$DOTNET_ROOT"
|
||||
if [ $? -ne 0 ]; then
|
||||
let sdk_retries=sdk_retries-1
|
||||
echo -e "${YELLOW}Failed to install .NET Core SDK $version. Retries left: $sdk_retries.${RESET}"
|
||||
else
|
||||
sdk_retries=0
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
./dotnet-install.sh --runtime dotnet --version $dotnet_runtime_version --install-dir "$DOTNET_ROOT"
|
||||
if [ $? -ne 0 ]; then
|
||||
runtime_retries=3
|
||||
while [ $runtime_retries -gt 0 ]; do
|
||||
./dotnet-install.sh --runtime dotnet --version $dotnet_runtime_version --install-dir "$DOTNET_ROOT"
|
||||
if [ $? -ne 0 ]; then
|
||||
let runtime_retries=runtime_retries-1
|
||||
echo -e "${YELLOW}Failed to install .NET Core runtime $version. Retries left: $runtime_retries.${RESET}"
|
||||
else
|
||||
runtime_retries=0
|
||||
fi
|
||||
done
|
||||
. eng/common/tools.sh
|
||||
InstallDotNet $DOTNET_ROOT $dotnet_sdk_version "" "" true || {
|
||||
exit_code=$?
|
||||
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
|
||||
ExitWithExitCode $exit_code
|
||||
}
|
||||
if [[ -z "${11:-}" ]]; then
|
||||
InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true || {
|
||||
exit_code=$?
|
||||
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
|
||||
ExitWithExitCode $exit_code
|
||||
}
|
||||
else
|
||||
InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true https://dotnetclimsrc.blob.core.windows.net/dotnet ${11} || {
|
||||
exit_code=$?
|
||||
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
|
||||
ExitWithExitCode $exit_code
|
||||
}
|
||||
fi
|
||||
|
||||
if [ -e /proc/self/coredump_filter ]; then
|
||||
|
|
@ -82,7 +57,7 @@ if [ -e /proc/self/coredump_filter ]; then
|
|||
echo -n 0x3F > /proc/self/coredump_filter
|
||||
fi
|
||||
|
||||
# dontet-install.sh seems to affect the Linux filesystem and causes test flakiness unless we sync the filesystem before running tests
|
||||
# dotnet-install.sh seems to affect the Linux filesystem and causes test flakiness unless we sync the filesystem before running tests
|
||||
sync
|
||||
|
||||
exit_code=0
|
||||
|
|
|
|||
|
|
@ -33,10 +33,76 @@ reporoot="$(dirname "$(dirname "$scriptroot")")"
|
|||
# mv "$reporoot/global.bak.json" "$reporoot/global.json"
|
||||
#}" EXIT
|
||||
|
||||
dotnet_runtime_source_feed=''
|
||||
dotnet_runtime_source_feed_key=''
|
||||
other_args=()
|
||||
|
||||
#
|
||||
# Functions
|
||||
#
|
||||
__usage() {
|
||||
echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] <Arguments>...]
|
||||
|
||||
Arguments:
|
||||
<Arguments>... Arguments passed to the command. Variable number of arguments allowed.
|
||||
|
||||
--dotnet-runtime-source-feed Additional feed that can be used when downloading .NET runtimes
|
||||
--dotnet-runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes
|
||||
|
||||
Description:
|
||||
This script is meant for testing source build by imitating some of the input parameters and conditions.
|
||||
"
|
||||
|
||||
if [[ "${1:-}" != '--no-exit' ]]; then
|
||||
exit 2
|
||||
fi
|
||||
}
|
||||
|
||||
__error() {
|
||||
echo -e "${RED}error: $*${RESET}" 1>&2
|
||||
}
|
||||
|
||||
#
|
||||
# main
|
||||
#
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
|
||||
case "$opt" in
|
||||
-\?|-h|-help)
|
||||
__usage --no-exit
|
||||
exit 0
|
||||
;;
|
||||
-dotnet-runtime-source-feed|-dotnetruntimesourcefeed)
|
||||
shift
|
||||
[ -z "${1:-}" ] && __error "Missing value for parameter --dotnet-runtime-source-feed" && __usage
|
||||
dotnet_runtime_source_feed="${1:-}"
|
||||
;;
|
||||
-dotnet-runtime-source-feed-key|-dotnetruntimesourcefeedkey)
|
||||
shift
|
||||
[ -z "${1:-}" ] && __error "Missing value for parameter --dotnet-runtime-source-feed-key" && __usage
|
||||
dotnet_runtime_source_feed_key="${1:-}"
|
||||
;;
|
||||
*)
|
||||
other_args[${#other_args[*]}]="$1"
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
# Set up additional runtime args
|
||||
runtime_feed_args=()
|
||||
if [ ! -z "$dotnet_runtime_source_feed$dotnet_runtime_source_feed_key" ]; then
|
||||
runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$dotnet_runtime_source_feed"
|
||||
runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$dotnet_runtime_source_feed_key"
|
||||
runtime_feed_args[${#runtime_feed_args[*]}]=$runtimeFeedArg
|
||||
runtime_feed_args[${#runtime_feed_args[*]}]=$runtimeFeedKeyArg
|
||||
fi
|
||||
|
||||
# Build repo tasks
|
||||
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj
|
||||
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj ${runtime_feed_args[@]+"${runtime_feed_args[@]}"}
|
||||
|
||||
export DotNetBuildFromSource='true'
|
||||
|
||||
# Build projects
|
||||
"$reporoot/eng/common/build.sh" --restore --build --pack "$@"
|
||||
"$reporoot/eng/common/build.sh" --restore --build --pack ${other_args[@]+"${other_args[@]}"} ${runtime_feed_args[@]+"${runtime_feed_args[@]}"}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,15 @@
|
|||
<ItemGroup Condition="$(BuildHelixPayload)">
|
||||
<Content Include="@(HelixContent)" />
|
||||
<Content Include="$(RepoRoot)eng\scripts\Download.ps1" />
|
||||
<Content Include="$(RepoRoot)NuGet.config" />
|
||||
<Content Include="$(RepoRoot)global.json" />
|
||||
<ContentWithTargetPath Include="
|
||||
$(RepoRoot)eng\common\pipeline-logging-functions.*;
|
||||
$(RepoRoot)eng\common\tools.*">
|
||||
<TargetPath>eng\common\%(Filename)%(Extension)</TargetPath>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
||||
</ContentWithTargetPath>
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
|
|
@ -117,8 +126,8 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
|
|||
<TestAssembly>$(TargetFileName)</TestAssembly>
|
||||
<PreCommands>@(HelixPreCommand)</PreCommands>
|
||||
<PostCommands>@(HelixPostCommand)</PostCommands>
|
||||
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg $(HelixTimeout)</Command>
|
||||
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg $(HelixTimeout)</Command>
|
||||
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command>
|
||||
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command>
|
||||
<Command Condition="$(HelixCommand) != ''">$(HelixCommand)</Command>
|
||||
<Timeout>$(HelixTimeout)</Timeout>
|
||||
</HelixWorkItem>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -363,6 +363,7 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
|
|||
resourceLoader.purgeUnusedCacheEntriesAsync(); // Don't await - it's fine to run in background
|
||||
|
||||
MONO.mono_wasm_setenv("MONO_URI_DOTNETRELATIVEORABSOLUTE", "true");
|
||||
MONO.mono_wasm_setenv("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1");
|
||||
const load_runtime = cwrap('mono_wasm_load_runtime', null, ['string', 'number']);
|
||||
// -1 enables debugging with logging disabled. 0 disables debugging entirely.
|
||||
load_runtime(appBinDirName, hasDebuggingEnabled() ? -1 : 0);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
<PropertyGroup>
|
||||
<ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
|
||||
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
||||
|
||||
<!-- https://github.com/dotnet/aspnetcore/issues/24182 -->
|
||||
<BuildHelixPayload>false</BuildHelixPayload>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ namespace InteropTestsClient
|
|||
services.AddLogging(configure =>
|
||||
{
|
||||
configure.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
|
||||
configure.AddConsole(loggerOptions =>
|
||||
configure.AddSimpleConsole(loggerOptions =>
|
||||
{
|
||||
loggerOptions.IncludeScopes = true;
|
||||
loggerOptions.DisableColors = true;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace InteropTestsWebsite
|
|||
Host.CreateDefaultBuilder(args)
|
||||
.ConfigureLogging(builder =>
|
||||
{
|
||||
builder.AddConsole(o => o.DisableColors = true);
|
||||
builder.AddSimpleConsole(o => o.DisableColors = true);
|
||||
builder.SetMinimumLevel(LogLevel.Trace);
|
||||
})
|
||||
.ConfigureWebHostDefaults(webBuilder =>
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.WebUtilities
|
|||
var keyValueReader = new SequenceReader<byte>(keyValuePair);
|
||||
ReadOnlySequence<byte> value;
|
||||
|
||||
if (keyValueReader.TryReadTo(out var key, equalsDelimiter))
|
||||
if (keyValueReader.TryReadTo(out ReadOnlySequence<byte> key, equalsDelimiter))
|
||||
{
|
||||
if (key.Length > KeyLengthLimit)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace FunctionalTests
|
|||
webHostBuilder
|
||||
.ConfigureLogging(factory =>
|
||||
{
|
||||
factory.AddConsole(options =>
|
||||
factory.AddSimpleConsole(options =>
|
||||
{
|
||||
options.IncludeScopes = true;
|
||||
options.TimestampFormat = "[HH:mm:ss] ";
|
||||
|
|
|
|||
Loading…
Reference in New Issue