Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 52d7184

Browse files
ViktorHoferViktorHofer
committed
Use Version suffix for version properties
1 parent 25520b1 commit 52d7184

File tree

14 files changed

+26
-27
lines changed

14 files changed

+26
-27
lines changed

‎Documentation/building/testing-with-corefx.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ For Linux and macOS:
155155
The published tests are summarized in a `corefx-test-assets.xml` file that lives here:
156156

157157
```
158-
https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml
158+
https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml
159159
```
160160

161-
where `MicrosoftPrivateCoreFxNETCoreAppPackageVersion` is defined in `eng\Versions.props`. For example:
161+
where `MicrosoftPrivateCoreFxNETCoreAppVersion` is defined in `eng\Versions.props`. For example:
162162

163163
```
164164
https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/4.6.0-preview8.19326.15/Linux.arm64/netcoreapp/corefx-test-assets.xml

‎eng/Versions.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@
2020
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2121
<MicrosoftDotNetVersionToolsTasksVersion>1.0.0-beta.19463.3</MicrosoftDotNetVersionToolsTasksVersion>
2222
<!-- corefx -->
23-
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>5.0.0-alpha.1.19531.1</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
23+
<MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha.1.19531.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
2424
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19531.1</MicrosoftNETCorePlatformsVersion>
25-
<MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
2625
<!-- core-setup -->
2726
<MicrosoftNETCoreAppVersion>5.0.0-alpha1.19527.2</MicrosoftNETCoreAppVersion>
2827
<!-- dotnet-optimization -->
2928
<optimizationIBCCoreCLRVersion>99.99.99-master-20190716.1</optimizationIBCCoreCLRVersion>
3029
<optimizationPGOCoreCLRVersion>99.99.99-master-20190716.1</optimizationPGOCoreCLRVersion>
3130
<!-- ilasm -->
32-
<MicrosoftNETCoreILAsmPackageVersion>5.0.0-alpha1.19413.7</MicrosoftNETCoreILAsmPackageVersion>
31+
<MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19413.7</MicrosoftNETCoreILAsmVersion>
3332
</PropertyGroup>
3433
<!--Package names-->
3534
<PropertyGroup>
36-
<MicrosoftDotNetXUnitConsoleRunnerPackage>Microsoft.DotNet.XUnitConsoleRunner</MicrosoftDotNetXUnitConsoleRunnerPackage>
35+
<MicrosoftDotNetXUnitConsoleRunnerPackage>microsoft.dotnet.xunitconsolerunner</MicrosoftDotNetXUnitConsoleRunnerPackage>
3736
<MicrosoftPrivateCoreFxNETCoreAppPackage>Microsoft.Private.CoreFx.NETCoreApp</MicrosoftPrivateCoreFxNETCoreAppPackage>
3837
<MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage>
3938
<MicrosoftNETCoreAppPackage>Microsoft.NETCore.App</MicrosoftNETCoreAppPackage>

‎eng/helixcorefxtests.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<Target Name="GetTestAssetManifest" Condition=" '$(UsesHelixSdk)' == 'true' " >
196196
<PropertyGroup>
197197
<_TargetGroup>netcoreapp</_TargetGroup>
198-
<_AssetManifestPath>$(TestAssetBlobFeedUrl)/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml</_AssetManifestPath>
198+
<_AssetManifestPath>$(TestAssetBlobFeedUrl)/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml</_AssetManifestPath>
199199
</PropertyGroup>
200200

201201
<ParseBuildManifest AssetManifestPath="$(_AssetManifestPath)">

‎src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2727
<_OSArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</_OSArchitecture>
2828

2929
<MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(MicrosoftNetCoreIlasmPackageRuntimeId)' == ''">$(_OSPlatform)-$(_OSArchitecture.ToLower())</MicrosoftNetCoreIlasmPackageRuntimeId>
30-
<MicrosoftNetCoreIlasmPackageVersion Condition="'$(MicrosoftNetCoreIlasmPackageVersion)' == ''">5.0.0</MicrosoftNetCoreIlasmPackageVersion>
30+
<MicrosoftNETCoreILAsmVersion Condition="'$(MicrosoftNETCoreILAsmVersion)' == ''">5.0.0</MicrosoftNETCoreILAsmVersion>
3131
<MicrosoftNetCoreIlasmPackageName>runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ilasm</MicrosoftNetCoreIlasmPackageName>
3232
<MicrosoftNetCoreIldasmPackageName>runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ildasm</MicrosoftNetCoreIldasmPackageName>
3333

@@ -39,8 +39,8 @@ Copyright (c) .NET Foundation. All rights reserved.
3939
</PropertyGroup>
4040

4141
<ItemGroup Condition="'$(ILAsmToolPath)' == ''">
42-
<_IlasmPackageReference Include="$(MicrosoftNetCoreIlasmPackageName)" Version="$(MicrosoftNetCoreIlasmPackageVersion)" />
43-
<_IlasmPackageReference Include="$(MicrosoftNetCoreIldasmPackageName)" Version="$(MicrosoftNetCoreIlasmPackageVersion)" />
42+
<_IlasmPackageReference Include="$(MicrosoftNetCoreIlasmPackageName)" Version="$(MicrosoftNETCoreILAsmVersion)" />
43+
<_IlasmPackageReference Include="$(MicrosoftNetCoreIldasmPackageName)" Version="$(MicrosoftNETCoreILAsmVersion)" />
4444
<PackageReference Include="@(_IlasmPackageReference)" ExcludeAssets="native" PrivateAssets="all" IsImplicitlyDefined="true" />
4545
</ItemGroup>
4646

‎tests/src/Common/CoreFX/CoreFX.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<ItemGroup>
3131
<!-- Microsoft.Private.CoreFx.OOB is a meta-package that contains references to most of what we need -->
32-
<PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
32+
<PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
3333

3434
<!-- dotnet.exe -->
3535
<PackageReference Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreAppVersion)" />

‎tests/src/Common/test_dependencies/test_dependencies.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
13-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
14-
<PackageReference Include="System.Security.Permissions" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
15-
<PackageReference Include="System.Diagnostics.EventLog" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
16-
<PackageReference Include="System.Drawing.Common" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
17-
<PackageReference Include="System.Runtime.Intrinsics.Experimental" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
12+
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
13+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
14+
<PackageReference Include="System.Security.Permissions" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
15+
<PackageReference Include="System.Diagnostics.EventLog" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
16+
<PackageReference Include="System.Drawing.Common" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
17+
<PackageReference Include="System.Runtime.Intrinsics.Experimental" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
1818
<PackageReference Include="Microsoft.Diagnostics.Tools.RuntimeClient" Version="$(MicrosoftDiagnosticsToolsRuntimeClientVersion)" />
1919
</ItemGroup>
2020

‎tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ProjectReference Include="../../NativeServer/CMakeLists.txt" />
2626
<ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
2727
<PackageReference Include="System.Drawing.Common">
28-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
28+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
2929
</PackageReference>
3030
</ItemGroup>
3131
</Project>

‎tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp">
14-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
14+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
1515
</PackageReference>
1616
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
17-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
17+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
1818
</PackageReference>
1919
</ItemGroup>
2020
<PropertyGroup>

‎tests/src/JIT/config/benchmark/benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
<Version>4.4.0-beta-24913-02</Version>
5757
</PackageReference>
5858
<PackageReference Include="System.Reflection.TypeExtensions">
59-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
59+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
6060
</PackageReference>
6161
<PackageReference Include="System.Runtime">
6262
<Version>4.4.0-beta-24913-02</Version>
6363
</PackageReference>
6464
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
65-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
65+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
6666
</PackageReference>
6767
<PackageReference Include="System.Runtime.Extensions">
6868
<Version>4.4.0-beta-24913-02</Version>

‎tests/src/helixpublishwitharcade.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<MSBuild Projects="xunitconsolerunner.depproj" Targets="Restore" />
125125

126126
<ItemGroup>
127-
<_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)$(MicrosoftDotNetXUnitConsoleRunnerPackage.ToLower())\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
127+
<_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)$(MicrosoftDotNetXUnitConsoleRunnerPackage)\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
128128
</ItemGroup>
129129

130130
<Copy SourceFiles="@(_XUnitConsoleRunnerFiles)" DestinationFolder="$(CoreRootDirectory)" />

0 commit comments

Comments
 (0)