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

Commit 464c03b

Browse files
authored
[release/3.1] Switch to using 3.1100 SDK to build 3.1 (#42757)
* Switch to using 3.1100 SDK to build 3.1 Required for upstack components, so this is for consistency. * Fix version * Fix restore of netcoreapp when not downloading any packages
1 parent 825b3d0 commit 464c03b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

eng/depProj.targets

+7-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ See the LICENSE file in the project root for more information.
6868
BeforeTargets="ResolvePackageAssets"
6969
Condition="'$(VSDesignTimeBuild)' != 'true'" />
7070

71-
<Target Name="CoreCompile" Condition="'@(PackageReference)' != '' Or '@(PackageDownload)' == ''">
71+
<Target Name="CoreCompile">
7272

7373
<Error Condition="'$(NuGetDeploySourceItem)' != 'ReferenceCopyLocalPaths' AND
7474
'$(NuGetDeploySourceItem)' != 'Reference' AND
@@ -98,8 +98,12 @@ See the LICENSE file in the project root for more information.
9898
</ContentWithTargetPath>
9999
</ItemGroup>
100100

101-
<Error Condition="'@(NuGetDeploy)' == ''" Text="Error no assets were resolved from NuGet packages." />
102-
<Message Importance="High" Text="%(FullPath) (%(NuGetPackageId).%(NuGetPackageVersion)) -&gt; @(NuGetDeploy->'$(TargetDir)%(SubFolder)%(FileName)%(Extension)')" />
101+
<Message Importance="High"
102+
Condition="'@(NuGetDeploy)' == ''"
103+
Text="$(MSBuildProjectFile): No assets were resolved from NuGet packages." />
104+
<Message Importance="High"
105+
Condition="'@(NuGetDeploy)' != ''"
106+
Text="%(FullPath) (%(NuGetPackageId).%(NuGetPackageVersion)) -&gt; @(NuGetDeploy->'$(TargetDir)%(SubFolder)%(FileName)%(Extension)')" />
103107

104108
<!-- Include marker files if an extension has been provided -->
105109
<!-- internal builds use this to distinguish files which have already been signed -->

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"sdk": {
3-
"version": "3.0.101",
3+
"version": "3.1.100",
44
"rollforward": "major"
55
},
66
"tools": {
7-
"dotnet": "3.0.101"
7+
"dotnet": "3.1.100"
88
},
99
"msbuild-sdks": {
1010
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5",

0 commit comments

Comments
 (0)