Skip to content

Unpin Microsoft.Extensions.Caching.Memory and Microsoft.Extensions.Logging #25323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mmitche wants to merge 2 commits into from
Closed

Unpin Microsoft.Extensions.Caching.Memory and Microsoft.Extensions.Logging #25323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
053f4be
Unpin Microsoft.Extensions.Caching.Memory and Microsoft.Extensions.Lo…
mmitche Jul 23, 2021
d3bdbba
Update arcade (pull in p6 sdk)
mmitche Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Dependencies>
<ProductDependencies>
<!-- NB: Pinned for compatibility with Preview 5 -->
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.6.21276.2" Pinned="True">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-rc.1.21369.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>f7e4c261815c66fde2c1e750b744f193e236c17e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-rc.1.21369.2">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -35,9 +35,9 @@
<Sha>f7e4c261815c66fde2c1e750b744f193e236c17e</Sha>
</Dependency>
<!-- NB: Pinned for compatibility with Preview 5 -->
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21276.2" Pinned="True">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.1.21369.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>f7e4c261815c66fde2c1e750b744f193e236c17e</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="6.0.0-rc.1.21369.2">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -49,13 +49,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21366.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21366.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b03966cd85285e425ffe56003c0ab57e103dd14e</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<PropertyGroup Label="Dependencies from dotnet/runtime">
<SystemCollectionsImmutableVersion>6.0.0-rc.1.21369.2</SystemCollectionsImmutableVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.1.21369.2</SystemDiagnosticsDiagnosticSourceVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-rc.1.21369.2</MicrosoftExtensionsLoggingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi

internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi

targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
Expand All @@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
$officialBuildArgs \
$internalRuntimeDownloadArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-preview.5.21302.13",
"dotnet": "6.0.100-preview.6.21355.2",
"runtimes": {
"dotnet": [
"3.1.16",
Expand All @@ -13,12 +13,12 @@
}
},
"sdk": {
"version": "6.0.100-preview.5.21302.13",
"version": "6.0.100-preview.6.21355.2",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21366.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21366.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16"
}
}