diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index f41f4965e..e89f3da42 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.13 - 10.0.18362.13 - 10.0.19041.13 + 10.0.17763.14 + 10.0.18362.14 + 10.0.19041.14 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01b5494d7..661e1c3fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -129,9 +129,9 @@ https://github.com/dotnet/msbuild f0eebf2872d76ab0cd43fdc4153ba636232b222f - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - ed9af679b4425c1ff4d41d2302d73f6e580a2839 + 5596ad8221369990f634a3d01f8c334e0ccb2b3d https://github.com/dotnet/CliCommandLineParser diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 3d12bd70a..37aa14a67 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -23,12 +23,16 @@ + + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 12)) + + Microsoft.NETCoreSdk.BundledVersions.props - - + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion) <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) @@ -50,10 +54,21 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 + + <_NETCoreApp31RuntimePackVersion>3.1.$(VersionFeature31) + <_NETCoreApp31TargetingPackVersion>3.1.0 + <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 + + <_WindowsDesktop31RuntimePackVersion>3.1.$(VersionFeature31) + <_WindowsDesktop31TargetingPackVersion>3.1.0 + <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 + + <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31) + <_AspNet31TargetingPackVersion>3.1.10 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) @@ -161,7 +176,7 @@ + LatestVersion="2.1.$(VersionFeature21)" /> + LatestVersion="2.1.$(VersionFeature21)"/> + LatestVersion="2.1.$(VersionFeature21)"/>