Skip to content

[net7.0] Update all ASP.NET and MS.Extensions packages to latest stable #17487

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

Merged
rmarinho merged 2 commits into from
Sep 20, 2023
Merged

[net7.0] Update all ASP.NET and MS.Extensions packages to latest stable #17487

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
8db96d1
[build] Bump aspnet package versions
rmarinho Sep 19, 2023
cfbc8c1
[net7.0] Dependabot will manage versions on main (#17488)
mattleibow Sep 19, 2023
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
22 changes: 11 additions & 11 deletions eng/Microsoft.Extensions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,47 @@
/>
<PackageReference
Update="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsServicingPackageVersion)"
Version="$(MicrosoftExtensionsConfigurationPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Configuration.Abstractions"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.DependencyInjection"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.FileProviders.Abstractions"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Logging.Abstractions"
Version="$(MicrosoftExtensionsServicingPackageVersion)"
Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Logging"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsLoggingPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Logging.Console"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Logging.Debug"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)"
/>
<PackageReference
Update="Microsoft.Extensions.Primitives"
Version="$(MicrosoftExtensionsPackageVersion)"
Version="$(MicrosoftExtensionsPrimitivesPackageVersion)"
/>
<PackageReference
Update="Microsoft.WindowsAppSDK"
Expand Down
37 changes: 23 additions & 14 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,19 @@
<MicrosoftDotnetSdkInternalPackageVersion>7.0.308-servicing.23415.1</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.11</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<!-- extensions -->
<MicrosoftExtensionsConfigurationPackageVersion>7.0.0</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>7.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>7.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>7.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>7.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>7.0.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>7.0.0</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>7.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>7.0.0</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>7.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.95</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
Expand All @@ -27,17 +36,17 @@
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
<MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
<!-- Everything else -->
<MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.0</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.0</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.0</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.0</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>7.0.0</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>7.0.0</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>7.0.0</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.0</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.0</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>7.0.0</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>7.0.0</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.11</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.11</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.11</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.11</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsFormsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
<MicrosoftAspNetCoreComponentsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.11</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.11</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreMetadataPackageVersion>7.0.1</MicrosoftAspNetCoreMetadataPackageVersion>
<MicrosoftJSInteropPackageVersion>7.0.11</MicrosoftJSInteropPackageVersion>
<!-- Other packages -->
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22274.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<ItemGroup Condition=" '$(UseMaui)' != 'true' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
</ItemGroup>

<ItemGroup Condition=" '$(UseMaui)' != 'true' ">
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/src/Microsoft.Maui.Templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
InputFilename="%(TemplateJsonInput.IntermediateLocation)"
OutputFilename="%(TemplateJsonInput.IntermediateLocation)"
MatchExpression="DOTNET_TFM_VALUE;DOTNET_TFM_VERSION_VALUE;DOTNET_TFM_VERSION_MAJOR_VALUE;MS_EXT_VERSION_VALUE"
ReplacementText="$(_MauiDotNetTfm);$(_MauiDotNetVersion);$(_MauiDotNetVersionMajor)000;$(MicrosoftExtensionsPackageVersion)" />
ReplacementText="$(_MauiDotNetTfm);$(_MauiDotNetVersion);$(_MauiDotNetVersionMajor)000;$(MicrosoftExtensionsLoggingDebugPackageVersion)" />

<ItemGroup>
<FileWrites Include="%(TemplateJsonInput.IntermediateLocation)" />
Expand Down
6 changes: 4 additions & 2 deletions src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@
<_ValuesToReplace Include="MAUI_PREVIOUS_DOTNET_RELEASED_NUGET_VERSION" PropertyName="MicrosoftMauiPreviousDotNetReleasedVersion" />
<_ValuesToReplace Include="MicrosoftWindowsAppSDKPackageVersion" PropertyName="MicrosoftWindowsAppSDKPackageVersion" />
<_ValuesToReplace Include="MicrosoftWindowsSDKBuildToolsPackageVersion" PropertyName="MicrosoftWindowsSDKBuildToolsPackageVersion" />
<_ValuesToReplace Include="MicrosoftExtensionsPackageVersion" PropertyName="MicrosoftExtensionsPackageVersion" />
<_ValuesToReplace Include="MicrosoftExtensionsServicingPackageVersion" PropertyName="MicrosoftExtensionsServicingPackageVersion" />
<_ValuesToReplace Include="MicrosoftExtensionsConfigurationPackageVersion" PropertyName="MicrosoftExtensionsConfigurationPackageVersion" />
<_ValuesToReplace Include="MicrosoftExtensionsDependencyInjectionPackageVersion" PropertyName="MicrosoftExtensionsDependencyInjectionPackageVersion" />
<_ValuesToReplace Include="MicrosoftExtensionsLoggingPackageVersion" PropertyName="MicrosoftExtensionsLoggingPackageVersion" />
<_ValuesToReplace Include="MicrosoftExtensionsLoggingDebugPackageVersion" PropertyName="MicrosoftExtensionsLoggingDebugPackageVersion" />
<_ValuesToReplace Include="TizenUIExtensionsVersion" PropertyName="TizenUIExtensionsVersion" />
<_ValuesToReplace Include="_XamarinAndroidGlideVersion" PropertyName="_XamarinAndroidGlideVersion" />
<_ValuesToReplace Include="_XamarinAndroidXSecurityVersion" PropertyName="_XamarinAndroidXSecurityVersion" />
Expand Down
9 changes: 3 additions & 6 deletions src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,13 @@

<!-- These implicit <PackageReference/> pull dependencies from NuGet transitively -->
<ItemGroup Condition=" ('$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true') and ('$(DisableMauiImplicitPackageReferences)' != 'true') ">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="@MicrosoftExtensionsConfigurationPackageVersion@" IsImplicitlyDefined="true">
<PrivateAssets Condition=" '$(OutputType)' == 'Library' and '$(AndroidApplication)' != 'true' ">all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="@MicrosoftExtensionsDependencyInjectionPackageVersion@" IsImplicitlyDefined="true">
<PrivateAssets Condition=" '$(OutputType)' == 'Library' and '$(AndroidApplication)' != 'true' ">all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true">
<PrivateAssets Condition=" '$(OutputType)' == 'Library' and '$(AndroidApplication)' != 'true' ">all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true">
<PackageReference Include="Microsoft.Extensions.Logging" Version="@MicrosoftExtensionsLoggingPackageVersion@" IsImplicitlyDefined="true">
<PrivateAssets Condition=" '$(OutputType)' == 'Library' and '$(AndroidApplication)' != 'true' ">all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down