File tree Expand file tree Collapse file tree 4 files changed +29
-23
lines changed Expand file tree Collapse file tree 4 files changed +29
-23
lines changed Original file line number Diff line number Diff line change 2
2
<!-- These package versions may be overridden or updated by automation. -->
3
3
<PropertyGroup Label =" Package Versions: Auto" Condition =" '$(DotNetPackageVersionPropsPath)' == '' " >
4
4
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
5
- <MicrosoftNETCoreAppPackageVersion >2.1.5 </MicrosoftNETCoreAppPackageVersion >
6
- <MicrosoftNETCoreDotNetAppHostPackageVersion >2.1.5 </MicrosoftNETCoreDotNetAppHostPackageVersion >
5
+ <MicrosoftNETCoreAppPackageVersion >2.1.6-servicing-27017-02 </MicrosoftNETCoreAppPackageVersion >
6
+ <MicrosoftNETCoreDotNetAppHostPackageVersion >2.1.6-servicing-27017-02 </MicrosoftNETCoreDotNetAppHostPackageVersion >
7
7
</PropertyGroup >
8
8
9
9
<Import Project =" $(DotNetPackageVersionPropsPath)" Condition =" '$(DotNetPackageVersionPropsPath)' != ''" />
Original file line number Diff line number Diff line change 42
42
<SharedFrameworkName Include =" Microsoft.AspNetCore.App" />
43
43
</ItemGroup >
44
44
45
- <ItemGroup >
46
- <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core -->
47
- <DotNetCoreRuntime Include =" $(MicrosoftNETCoreApp20PackageVersion)" Condition =" '$(SharedFXRid)' != 'linux-musl-x64'" />
48
-
49
- <DotNetCoreRuntime Include =" $(MicrosoftNETCoreApp21PackageVersion)"
50
- Feed =" $(DotNetAssetRootUrl)"
51
- FeedCredential =" $(DotNetAssetRootAccessTokenSuffix)" />
52
-
53
- <DotNetCoreRuntime Condition =" '$(OS)' == 'Windows_NT'"
54
- Include =" $(MicrosoftNETCoreApp21PackageVersion)"
55
- Arch =" x86"
56
- Feed =" $(DotNetAssetRootUrl)"
57
- FeedCredential =" $(DotNetAssetRootAccessTokenSuffix)" />
58
-
59
- <!--
60
- The build doesn't support compiling the shared runtime on one machine along with running tests,
61
- so this is enables installing the shared runtime from a previous build.
62
- -->
63
- <AspNetCoreRuntime Include =" $(PackageVersion)" Feed =" $(AspNetCoreFxFeed)" Condition =" '$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" />
64
- </ItemGroup >
65
-
66
45
<!-- Properties for publishing -->
67
46
<PropertyGroup >
68
47
<!-- myget = non-orchestrated builds -->
74
53
<PublishToTransportFeed Condition =" $(PublishType.Contains('blob'))" >true</PublishToTransportFeed >
75
54
</PropertyGroup >
76
55
56
+ <Import Project =" runtimes.props" />
77
57
<Import Project =" sources.props" />
78
58
<Import Project =" external-dependencies.props" />
79
59
<Import Project =" artifacts.props" />
Original file line number Diff line number Diff line change
1
+ <Project >
2
+
3
+ <ItemGroup >
4
+ <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core -->
5
+ <DotNetCoreRuntime Include =" $(MicrosoftNETCoreApp20PackageVersion)" Condition =" '$(SharedFXRid)' != 'linux-musl-x64'" />
6
+
7
+ <DotNetCoreRuntime Include =" $(MicrosoftNETCoreApp21PackageVersion)"
8
+ Feed =" $(DotNetAssetRootUrl)"
9
+ FeedCredential =" $(DotNetAssetRootAccessTokenSuffix)" />
10
+
11
+ <DotNetCoreRuntime Condition =" '$(OS)' == 'Windows_NT'"
12
+ Include =" $(MicrosoftNETCoreApp21PackageVersion)"
13
+ Arch =" x86"
14
+ Feed =" $(DotNetAssetRootUrl)"
15
+ FeedCredential =" $(DotNetAssetRootAccessTokenSuffix)" />
16
+
17
+ <!--
18
+ The build doesn't support compiling the shared runtime on one machine along with running tests,
19
+ so this is enables installing the shared runtime from a previous build.
20
+ -->
21
+ <AspNetCoreRuntime Include =" $(PackageVersion)" Feed =" $(AspNetCoreFxFeed)" Condition =" '$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" />
22
+ </ItemGroup >
23
+
24
+ </Project >
Original file line number Diff line number Diff line change 1
1
<Project >
2
+ <Import Project =" ..\..\..\build\dependencies.props" />
3
+ <Import Project =" ..\..\..\build\runtimes.props" />
2
4
<PropertyGroup >
3
5
<!-- TODO: temporary while we reorganize source code and refactor dependency management -->
4
6
<DisablePackageReferenceRestrictions >true</DisablePackageReferenceRestrictions >
You can’t perform that action at this time.
0 commit comments