Skip to content

Commit 326507b

Browse files
dougbudougbu
authored
Correct $(SharedFxVersion) and $(TargetingPackVersion) values (#25790)
* Correct `$(SharedFxVersion)` and `$(TargetingPackVersion)` values - Ensure `$(SharedFxVersion)` doesn't change in `$(NoSemVer20)` projects - Ignore current project's `$(VersionSuffix)` in `$(TargetingPackVersion)` - Never assume `$(AspNetCoreBaselineVersion)` matches released targeting pack - Stabilize both versions correctly - Use these properties more widely - Remove other mechanisms to get the same values - Reduce use of the `_GetPackageVersionInfo` target - Reduce use of `$(SharedFxVersion)` for the targeting pack nits: - Correct comments about old RTMVersions.csproj project - Fix or remove a few other comments * Do not pass package filenames on Helix command Lines - remove parsing of these command-line arguments from `RuntestOptions` - instead craft the names using passed `$(SharedFxVersion)` - restore `$(DotNetRuntimeSourceFeedKey)` on Helix command line - lost somewhere along the line - correct argument count in runtests.sh - treated 11th argument as both Helix timeout and feed credential - count was messed up somewhere alone the line nits: - update C# syntax in `RuntestOptions` e.g. remove unused `public` setters - sort and group properties and their assignments
1 parent b5515a8 commit 326507b

File tree

14 files changed

+66
-137
lines changed

14 files changed

+66
-137
lines changed

‎Directory.Build.targets‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@
3636
<SiteExtensionPackageVersion Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix.Replace('.','-'))</SiteExtensionPackageVersion>
3737

3838
<PackageVersion Condition=" '$(PackageVersion)' == '' ">$(Version)</PackageVersion>
39-
<PackageVersion Condition=" '$(NoSemVer20)' == 'true' ">$(SiteExtensionPackageVersion)</PackageVersion>
39+
4040
<SharedFxVersion>$(PackageVersion)</SharedFxVersion>
41+
<SharedFxVersion Condition=" '$(StabilizePackageVersion)' == 'true' ">$(VersionPrefix)</SharedFxVersion>
42+
<SharedFxProductName>$(Product) $(SharedFxVersion) Shared Framework</SharedFxProductName>
4143

42-
<TargetingPackVersion>$(TargetingPackVersionPrefix)</TargetingPackVersion>
43-
<TargetingPackVersion Condition=" '$(VersionSuffix)' != '' ">$(TargetingPackVersionPrefix)-$(VersionSuffix)</TargetingPackVersion>
44+
<TargetingPackVersion>$(SharedFxVersion)</TargetingPackVersion>
45+
<TargetingPackVersion Condition=" ! $(IsTargetingPackBuilding) ">$(TargetingPackVersionPrefix)</TargetingPackVersion>
4446

45-
<SharedFxProductName>$(Product) $(PackageVersion) Shared Framework</SharedFxProductName>
47+
<PackageVersion Condition=" '$(NoSemVer20)' == 'true' ">$(SiteExtensionPackageVersion)</PackageVersion>
4648
</PropertyGroup>
4749

4850
<PropertyGroup>
@@ -156,7 +158,7 @@
156158
<KnownFrameworkReference Condition="'$(UseAspNetCoreSharedRuntime)' == 'true' AND '$(DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp)' != 'true'" Update="Microsoft.AspNetCore.App">
157159
<LatestRuntimeFrameworkVersion>$(SharedFxVersion)</LatestRuntimeFrameworkVersion>
158160
<DefaultRuntimeFrameworkVersion Condition="'$(IsServicingBuild)' != 'true'">$(SharedFxVersion)</DefaultRuntimeFrameworkVersion>
159-
<TargetingPackVersion Condition="'$(IsServicingBuild)' != 'true'">$(SharedFxVersion)</TargetingPackVersion>
161+
<TargetingPackVersion Condition="'$(IsServicingBuild)' != 'true'">$(TargetingPackVersion)</TargetingPackVersion>
160162
</KnownFrameworkReference>
161163

162164
<!-- Track compiler separately from Arcade.-->

‎eng/Dependencies.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ and are generated based on the last package release.
7373
<LatestPackageReference Include="System.Reflection.Metadata" />
7474
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" />
7575
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
76-
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
76+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
7777
<LatestPackageReference Include="System.Security.AccessControl" />
7878
<LatestPackageReference Include="System.Security.Cryptography.Cng" />
7979
<LatestPackageReference Include="System.Security.Cryptography.Pkcs" />

‎eng/Version.Details.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<Uri>https://github.com/dotnet/runtime</Uri>
242242
<Sha>7d39776332446d8a84f5d542c80d264fa1cadbe7</Sha>
243243
</Dependency>
244-
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
244+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
245245
<Dependency Name="System.Security.AccessControl" Version="5.0.0-rc.2.20461.4">
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247247
<Sha>7d39776332446d8a84f5d542c80d264fa1cadbe7</Sha>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<SystemReflectionMetadataPackageVersion>5.0.0-rc.2.20461.4</SystemReflectionMetadataPackageVersion>
119119
<SystemResourcesExtensionsPackageVersion>5.0.0-rc.2.20461.4</SystemResourcesExtensionsPackageVersion>
120120
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-rc.2.20461.4</SystemRuntimeCompilerServicesUnsafePackageVersion>
121-
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
121+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
122122
<SystemSecurityAccessControlPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityAccessControlPackageVersion>
123123
<SystemSecurityCryptographyCngPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityCryptographyCngPackageVersion>
124124
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityCryptographyPkcsPackageVersion>
@@ -170,7 +170,7 @@
170170
runtime packages for everything else. This is not an issue for assemblies available in Microsoft.NETCore.App.Ref or
171171
Microsoft.Extensions.Internal.Transport because it is next to impossible we would service those packages.
172172
173-
System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. Because
173+
System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. Because
174174
it's a transitive reference, we reship the ref/ assembly in Microsoft.AspNetCore.App.Ref. dotnet/runtime ships
175175
the implementation assemblies in Microsoft.NETCore.App.Runtime.* packages.
176176

‎eng/helix/content/RunTests/RunTestsOptions.cs‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -46,51 +46,48 @@ public static RunTestsOptions Parse(string[] args)
4646
description: "The version of the EF tool to use")
4747
{ Argument = new Argument<string>(), Required = true },
4848

49-
new Option(
50-
aliases: new string[] { "--aspnetruntime" },
51-
description: "The path to the aspnet runtime nupkg to install")
52-
{ Argument = new Argument<string>(), Required = true },
53-
54-
new Option(
55-
aliases: new string[] { "--aspnetref" },
56-
description: "The path to the aspnet ref nupkg to install")
57-
{ Argument = new Argument<string>(), Required = true },
58-
5949
new Option(
6050
aliases: new string[] { "--helixTimeout" },
6151
description: "The timeout duration of the Helix job")
6252
{ Argument = new Argument<string>(), Required = true },
6353
};
6454

6555
var parseResult = command.Parse(args);
66-
var options = new RunTestsOptions();
67-
options.Target = parseResult.ValueForOption<string>("--target");
68-
options.RuntimeVersion = parseResult.ValueForOption<string>("--runtime");
69-
options.HelixQueue = parseResult.ValueForOption<string>("--queue");
70-
options.Architecture = parseResult.ValueForOption<string>("--arch");
71-
options.Quarantined = parseResult.ValueForOption<bool>("--quarantined");
72-
options.EfVersion = parseResult.ValueForOption<string>("--ef");
73-
options.AspNetRuntime = parseResult.ValueForOption<string>("--aspnetruntime");
74-
options.AspNetRef = parseResult.ValueForOption<string>("--aspnetref");
75-
options.Timeout = TimeSpan.Parse(parseResult.ValueForOption<string>("--helixTimeout"));
76-
options.HELIX_WORKITEM_ROOT = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
77-
options.Path = Environment.GetEnvironmentVariable("PATH");
78-
options.DotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT");
56+
var sharedFxVersion = parseResult.ValueForOption<string>("--runtime");
57+
var options = new RunTestsOptions
58+
{
59+
Architecture = parseResult.ValueForOption<string>("--arch"),
60+
EfVersion = parseResult.ValueForOption<string>("--ef"),
61+
HelixQueue = parseResult.ValueForOption<string>("--queue"),
62+
Quarantined = parseResult.ValueForOption<bool>("--quarantined"),
63+
RuntimeVersion = sharedFxVersion,
64+
Target = parseResult.ValueForOption<string>("--target"),
65+
Timeout = TimeSpan.Parse(parseResult.ValueForOption<string>("--helixTimeout")),
66+
67+
// When targeting pack builds, it has exactly the same version as the shared framework.
68+
AspNetRef = $"Microsoft.AspNetCore.App.Ref.{sharedFxVersion}.nupkg",
69+
AspNetRuntime = $"Microsoft.AspNetCore.App.Runtime.win-x64.{sharedFxVersion}.nupkg",
70+
71+
DotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT"),
72+
HELIX_WORKITEM_ROOT = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"),
73+
Path = Environment.GetEnvironmentVariable("PATH"),
74+
};
75+
7976
return options;
8077
}
8178

82-
public string Target { get; set;}
83-
public string SdkVersion { get; set;}
84-
public string RuntimeVersion { get; set;}
85-
public string AspNetRuntime { get; set;}
86-
public string AspNetRef { get; set;}
87-
public string HelixQueue { get; set;}
88-
public string Architecture { get; set;}
89-
public bool Quarantined { get; set;}
90-
public string EfVersion { get; set;}
91-
public string HELIX_WORKITEM_ROOT { get; set;}
92-
public string DotnetRoot { get; set; }
79+
public string Architecture { get; private set; }
80+
public string EfVersion { get; private set; }
81+
public string HelixQueue { get; private set; }
82+
public bool Quarantined { get; private set; }
83+
public string RuntimeVersion { get; private set; }
84+
public string Target { get; private set; }
85+
public TimeSpan Timeout { get; private set; }
86+
87+
public string AspNetRef { get; private set; }
88+
public string AspNetRuntime { get; private set; }
89+
public string HELIX_WORKITEM_ROOT { get; private set; }
90+
public string DotnetRoot { get; private set; }
9391
public string Path { get; set; }
94-
public TimeSpan Timeout { get; set; }
9592
}
9693
}

‎eng/helix/content/runtests.cmd‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ set $queue=%5
1010
set $arch=%6
1111
set $quarantined=%7
1212
set $ef=%8
13-
set $aspnetruntime=%9
14-
REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
15-
shift
16-
set $aspnetref=%9
17-
shift
1813
set $helixTimeout=%9
14+
REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
1915
shift
2016
set $feedCred=%9
2117

@@ -40,8 +36,8 @@ set exit_code=0
4036
echo "Restore: dotnet restore RunTests\RunTests.csproj --ignore-failed-sources"
4137
dotnet restore RunTests\RunTests.csproj --ignore-failed-sources
4238

43-
echo "Running tests: dotnet run --no-restore --project RunTests\RunTests.csproj -- --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%"
44-
dotnet run --no-restore --project RunTests\RunTests.csproj -- --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%
39+
echo "Running tests: dotnet run --no-restore --project RunTests\RunTests.csproj -- --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --helixTimeout %$helixTimeout%"
40+
dotnet run --no-restore --project RunTests\RunTests.csproj -- --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --helixTimeout %$helixTimeout%
4541
if errorlevel neq 0 (
4642
set exit_code=%errorlevel%
4743
)

‎eng/helix/content/runtests.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ InstallDotNet $DOTNET_ROOT $dotnet_sdk_version "" "" true || {
3636
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
3737
ExitWithExitCode $exit_code
3838
}
39-
if [[ -z "${11:-}" ]]; then
39+
if [[ -z "${10:-}" ]]; then
4040
InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true || {
4141
exit_code=$?
4242
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
4343
ExitWithExitCode $exit_code
4444
}
4545
else
46-
InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true https://dotnetclimsrc.blob.core.windows.net/dotnet ${11} || {
46+
InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true https://dotnetclimsrc.blob.core.windows.net/dotnet ${10} || {
4747
exit_code=$?
4848
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
4949
ExitWithExitCode $exit_code
@@ -65,8 +65,8 @@ exit_code=0
6565
echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources"
6666
$DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources
6767

68-
echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --aspnetruntime $9 --aspnetref ${10} --helixTimeout ${11}"
69-
$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --aspnetruntime $9 --aspnetref ${10} --helixTimeout ${11}
68+
echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
69+
$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
7070
exit_code=$?
7171
echo "Finished tests...exit_code=$exit_code"
7272

‎eng/targets/Helix.targets‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,8 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
106106
<HelixContent Include="$(OutputPath)/Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestLogger.dll" />
107107
</ItemGroup>
108108

109-
<!--
110-
Could use _GetPackageVersionInfo target (defined in eng/targets/Packaging.targets and included in every C#
111-
and F# project) instead of the $(SharedFxVersion) property but the property works everywhere except in site
112-
extensions projects. Could also use $(TargetingPackVersion) but that has slightly more complicated semantics
113-
and doesn't keep up when in servicing.
114-
-->
115109
<ItemGroup Condition=" '$(TestDependsOnAspNetRef)' == 'true' AND '$(IsTargetingPackBuilding)' == 'true' ">
116-
<HelixContent Include="$(RepoRoot)artifacts\packages\Release\Shipping\Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg" />
110+
<HelixContent Include="$(RepoRoot)artifacts\packages\Release\Shipping\Microsoft.AspNetCore.App.Ref.$(TargetingPackVersion).nupkg" />
117111
</ItemGroup>
118112

119113
<ItemGroup Condition=" '$(TestDependsOnAspNetRuntime)' == 'true' ">
@@ -139,8 +133,12 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
139133
<TestAssembly>$(TargetFileName)</TestAssembly>
140134
<PreCommands>@(HelixPreCommand)</PreCommands>
141135
<PostCommands>@(HelixPostCommand)</PostCommands>
142-
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(SharedFxVersion).nupkg Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg $(HelixTimeout)</Command>
143-
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(SharedFxVersion).nupkg Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg $(HelixTimeout)</Command>
136+
<!--
137+
When the targeting pack builds, it has exactly the same version as the shared framework. Passing
138+
SharedFxVersion because that's needed even when the targeting pack isn't building.
139+
-->
140+
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command>
141+
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey)</Command>
144142
<Command Condition="$(HelixCommand) != ''">$(HelixCommand)</Command>
145143
<Timeout>$(HelixTimeout)</Timeout>
146144
</HelixWorkItem>

‎src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,6 @@
7070
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
7171
</MSBuild>
7272

73-
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
74-
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
75-
Targets="_GetPackageVersionInfo"
76-
SkipNonexistentProjects="false">
77-
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />
78-
</MSBuild>
79-
80-
<!-- Runtime and Ref packs may have separate versions. -->
81-
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
82-
Targets="_GetPackageVersionInfo"
83-
SkipNonexistentProjects="false">
84-
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />
85-
</MSBuild>
86-
8773
<ItemGroup>
8874
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
8975
<_Parameter1>TargetingPackDependencies</_Parameter1>
@@ -119,12 +105,12 @@
119105

120106
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
121107
<_Parameter1>RuntimePackageVersion</_Parameter1>
122-
<_Parameter2>@(_RuntimePackageVersionInfo->'%(PackageVersion)')</_Parameter2>
108+
<_Parameter2>$(SharedFxVersion)</_Parameter2>
123109
</AssemblyAttribute>
124110

125111
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
126112
<_Parameter1>TargetingPackVersion</_Parameter1>
127-
<_Parameter2>@(_TargetingPackVersionInfo->'%(PackageVersion)')</_Parameter2>
113+
<_Parameter2>$(TargetingPackVersion)</_Parameter2>
128114
</AssemblyAttribute>
129115
</ItemGroup>
130116
</Target>

‎src/Grpc/test/testassets/InteropWebsite/Directory.Build.targets‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
<PropertyGroup>
66
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir)</RestoreAdditionalProjectSources>
7-
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' != 'false'">$(TargetingPackVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
8-
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' == 'false'">$(AspNetCoreBaselineVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
97
</PropertyGroup>
108

119
<!-- Use the shared framework that was produced -->
@@ -18,7 +16,7 @@
1816
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
1917
DefaultRuntimeFrameworkVersion="$(SharedFxVersion)"
2018
LatestRuntimeFrameworkVersion="$(SharedFxVersion)"
21-
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
19+
TargetingPackVersion="$(TargetingPackVersion)"
2220
RuntimePackRuntimeIdentifiers="$(SupportedRuntimeIdentifiers)" />
2321
</ItemGroup>
2422
</Project>

0 commit comments

Comments
 (0)