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

[release/3.1] Switch to using 3.1100 SDK to build 3.1 #42757

Merged
merged 3 commits into from
Dec 7, 2019
Merged

[release/3.1] Switch to using 3.1100 SDK to build 3.1 #42757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f268e84
Switch to using 3.1100 SDK to build 3.1
mmitche Dec 5, 2019
dcb36a8
Fix version
mmitche Dec 5, 2019
623cfe7
Fix restore of netcoreapp when not downloading any packages
ericstj Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions eng/depProj.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ See the LICENSE file in the project root for more information.
BeforeTargets="ResolvePackageAssets"
Condition="'$(VSDesignTimeBuild)' != 'true'" />

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

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

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

<!-- Include marker files if an extension has been provided -->
<!-- internal builds use this to distinguish files which have already been signed -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "3.0.101",
"version": "3.1.100",
"rollforward": "major"
},
"tools": {
"dotnet": "3.0.101"
"dotnet": "3.1.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5",
Expand Down