Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix vcxproj global package restore #155

Open
wants to merge 440 commits into
base: main
Choose a base branch
from
Open

Fix vcxproj global package restore #155

wants to merge 440 commits into from

Conversation

erikmav
Copy link

@erikmav erikmav commented Dec 21, 2022

Fix the case of .vcxproj file restore when there are no TargetMonikers and there may or may not be a RID. For #154

dotnet-maestro bot added 30 commits July 2, 2021 12:25
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
f1286aa 
…701.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21351.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
bb7644b 
…705.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21355.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
bd0b616 
…707.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21357.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
211507d 
…709.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21359.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
5b57476 
…713.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21363.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
c4de7ea 
…714.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21364.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
59de038 
…715.11

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21365.11
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
075322d 
…716.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21366.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
9805eee 
…719.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21369.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
5e5c62e 
…720.12

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21370.12
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
3e59d15 
…723.11

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21373.11
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
6beaf1a 
…726.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21376.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
79aa550 
…727.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21377.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
11bf8cd 
…728.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21378.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
0a9f379 
…729.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21379.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
ebeaf3c 
…803.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21403.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
960c9e3 
…806.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21406.6
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
7b25ac6 
…810.8

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21410.8
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
a7d3786 
…812.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21412.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
daaa99a 
…813.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21413.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
46fbe39 
…817.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21417.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
239579a 
…818.12

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21418.12
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
42bed84 
…819.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21419.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
d2062a7 
…820.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21420.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
cd55876 
…824.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21424.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
18d9afe 
…825.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21425.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
78c1b11 
…826.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21426.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
d43cf2a 
…827.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21427.6
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
91b1d1c 
…830.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21430.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
069c3a0 
…901.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21314.1 -> To Version 6.0.0-beta.21451.3
dotnet-maestro bot and others added 25 commits July 16, 2022 12:34
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
74c9670 
…715.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22365.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
fc89935 
…717.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22367.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
4c0804f 
…718.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22368.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
5bce642 
…719.9

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22369.9
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
2976ef8 
…720.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22370.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
79f7f71 
…721.8

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22371.8
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
12d3f88 
…722.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22372.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
69fc709 
…725.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22375.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
11feaed 
…726.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22376.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
c04ea61 
…727.15

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22377.15
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
a5a1a5c 
…728.16

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22378.16
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
117e2ab 
…729.10

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22379.10
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
7e2ba34 
…801.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22401.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
b2f6e85 
…802.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22402.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
b8f7dde 
…803.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22403.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
4431c60 
…805.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22405.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
5da746d 
…805.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22405.6
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
b1f63a7 
…808.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22408.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
588d62a 
…810.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22410.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
7775266 
…811.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22411.2
@MiYanni
Merge pull request dotnet#149 from dotnet/darc-main-9b506e5d-8d41-45d…
5dbc544 
…e-ba8c-29c8ad25514e

[main] Update dependencies from dotnet/arcade
@MiYanni
Add the _manifest directory that is now being created.
25f0870
@MiYanni
Remove SBOM workaround entirely.
c325006
@MiYanni
Merge pull request dotnet#150 from dotnet/feature/SbomFixPath
8156ef8 
Remove custom SBOM fix
@erikmav
Fix the case of .vcxproj file restore when there are no TargetMoniker…
5cd0414 
…s and there may or may not be a RID
dfederm
dfederm reviewed Apr 2, 2024
View reviewed changes
src/Microsoft.NuGet.Build.Tasks.Tests/Json/Json.resx
@@ -157,4 +157,7 @@
<data name="WithTargets_assets" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>WithTargets.assets.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="GlobalMSBuildPlugin_vcxproj" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>GlobalMSBuildPlugin.vcxproj.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: spaces vs tabs

dfederm
dfederm reviewed Apr 2, 2024
View reviewed changes
src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
@@ -779,7 +779,8 @@ private void GiveErrorForMissingFramework()
nameof(Strings.MissingFrameworkInProjectJson) :
nameof(Strings.MissingFrameworkInProjectFile);

ThrowExceptionIfNotAllowingFallback(missingFrameworkErrorString, TargetMonikers.First().ItemSpec);
string itemSpec = TargetMonikers.FirstOrDefault()?.ItemSpec ?? "???";
Copy link
Contributor

@dfederm dfederm Apr 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would resolve the message as:

Your project does not reference "???" framework. Add a reference to "???" in the "TargetFrameworks" property of your project file and then re-run NuGet restore.

Which isn't super clear what it's talking about. I suppose it's better than an exception, but still doesn't seem very actionable (I at least wouldn't know what to do).

@adamint adamint force-pushed the main branch 3 times, most recently from d33a600 to caf84b8 Compare September 24, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dfederm dfederm dfederm left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@erikmav @dfederm @tmeschter @dotnet-bot @drewnoakes @MiYanni @adamint