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

Resolve assets from targeting pack #2774

Merged
merged 25 commits into from
Jan 11, 2019
Merged

Resolve assets from targeting pack #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7605981
Add strings for runtime, apphost, or targeting pack not available
dsplaisted Dec 20, 2018
dd68a4b
Use assets directly from targeting packs instead of going through ass…
dsplaisted Dec 20, 2018
b35589f
Use assets file to resolve path to downloaded targeting or apphost packs
dsplaisted Dec 21, 2018
4513b1f
Reference runtime packs for self-contained apps
dsplaisted Dec 21, 2018
689bdc6
Update .NET Core KnownFrameworkReference to correct version
dsplaisted Dec 26, 2018
ea8eae0
Update to stage 0 with additional KnownFrameworkReference information
dsplaisted Dec 31, 2018
bc971ef
Add more test coverage for .NET Core 3.0
dsplaisted Jan 3, 2019
b15bfe1
Use assets file cache for PackageFolders
dsplaisted Jan 3, 2019
d8d6baa
Add error messages if runtime pack or apphost not found for specified…
dsplaisted Jan 4, 2019
b381e7f
Use runtime graph bundled in core-sdk, implicitly reference Platforms…
dsplaisted Jan 4, 2019
4303b79
Move ResolveFrameworkReferences target into approprate .targets file
dsplaisted Jan 4, 2019
dcced57
Simplify / rename targeting / apphost pack path calculation
dsplaisted Jan 4, 2019
2880c5c
Allow runtime graph to be cached across builds
dsplaisted Jan 4, 2019
a777a2c
Miscellaneous .targets cleanup
dsplaisted Jan 4, 2019
f513587
Update string per code review feedback
dsplaisted Jan 8, 2019
f1c6182
Apply code review feedback
dsplaisted Jan 8, 2019
e893fe0
Restore with apphost runtime identifier when using apphost for .NET C…
dsplaisted Jan 8, 2019
cc72141
Don't try to use AppHost for .NET Core 2.0 or earlier
dsplaisted Jan 9, 2019
6506488
Merge upstream changes
dsplaisted Jan 9, 2019
58f0d56
Apply code review feedback
dsplaisted Jan 9, 2019
39bd2bd
Add workaround for hostfxr bug with multiple frameworks in runtimeconfig
dsplaisted Jan 9, 2019
9a48f6b
Use task to resolve assets from targeting packs
dsplaisted Jan 10, 2019
d680999
Add target to handle user secrets attribute
dsplaisted Jan 10, 2019
09bb761
Apply code review feedback and fix tests
dsplaisted Jan 10, 2019
7658996
Don't try to resolve targeting pack assets if there aren't any target…
dsplaisted Jan 10, 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
1 change: 1 addition & 0 deletions eng/restore-toolset.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "1.0.5"
InstallDotNetSharedFramework "1.1.2"
InstallDotNetSharedFramework "2.1.0"
InstallDotNetSharedFramework "2.2.0"

CreateBuildEnvScript
InstallNuget
Expand Down
1 change: 1 addition & 0 deletions eng/restore-toolset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "1.0.5"
InstallDotNetSharedFramework "1.1.2"
InstallDotNetSharedFramework "2.1.0"
InstallDotNetSharedFramework "2.2.0"
}

# Installs additional shared frameworks for testing purposes
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.0.100-preview-009834",
"dotnet": "3.0.100-preview-010000",
"vs-opt": {
"version": "15.9"
}
Expand Down
2 changes: 2 additions & 0 deletions src/Tasks/Common/MetadataKeys.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ internal static class MetadataKeys
public const string NuGetPackageId = "NuGetPackageId";
public const string NuGetPackageVersion = "NuGetPackageVersion";
public const string NuGetSourceType = "NuGetSourceType";
public const string RelativePath = "RelativePath";
public const string PackageDirectory = "PackageDirectory";

// References
public const string ExternallyResolved = "ExternallyResolved";
Expand Down
16 changes: 16 additions & 0 deletions src/Tasks/Common/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,4 +436,20 @@ The following are names of parameters or literal values and should not be transl
<value>NETSDK1080: A PackageReference to Microsoft.AspNetCore.App is not necessary when targeting .NET Core 3.0 or higher. If Microsoft.NET.Sdk.Web is used, the shared framework will be referenced automatically. Otherwise, the PackageReference should be replaced with a FrameworkReference.</value>
<comment>{StrBegin="NETSDK1080: "}</comment>
</data>
<data name="UnresolvedTargetingPack" xml:space="preserve">
<value>NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</value>
<comment>{StrBegin="NETSDK1081: "}</comment>
</data>
<data name="NoAppHostAvailable" xml:space="preserve">
<value>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</value>
<comment>{StrBegin="NETSDK1084: "}</comment>
</data>
<data name="NoRuntimePackAvailable" xml:space="preserve">
<value>NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</value>
<comment>{StrBegin="NETSDK1082: "}</comment>
</data>
<data name="RuntimeIdentifierNotRecognized" xml:space="preserve">
<value>NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</value>
<comment>{StrBegin="NETSDK1083: "}</comment>
</data>
</root>
20 changes: 20 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<target state="translated">NETSDK1069: Tento projekt používá knihovnu, která cílí na .NET Standard 1.5 nebo vyšší, a projekt cílí na verzi .NET Frameworku, která nemá integrovanou podporu pro tuto verzi .NET Standardu. Podívejte na stránku https://aka.ms/net-standard-known-issues, kde najdete sadu známých problémů. Zvažte změnu cíle na .NET Framework 4.7.2.</target>
<note>{StrBegin="NETSDK1069: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="new">NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</target>
<note>{StrBegin="NETSDK1084: "}</note>
</trans-unit>
<trans-unit id="NoCompatibleTargetFramework">
<source>NETSDK1002: Project '{0}' targets '{2}'. It cannot be referenced by a project that targets '{1}'.</source>
<target state="translated">NETSDK1002: Cílem projektu {0} je {2}. Nemůže na něj odkazovat projekt, jehož cílem je {1}.</target>
Expand Down Expand Up @@ -102,11 +107,21 @@
<target state="translated">NETSDK1008: Chybí metadata {0} o {1} položky {2}.</target>
<note>{StrBegin="NETSDK1008: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackAvailable">
<source>NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</source>
<target state="new">NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="PackageReferenceVersionNotRecommended">
<source>NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</source>
<target state="new">NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</target>
<note />
</trans-unit>
<trans-unit id="RuntimeIdentifierNotRecognized">
<source>NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</source>
<target state="new">NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</target>
<note>{StrBegin="NETSDK1083: "}</note>
</trans-unit>
<trans-unit id="UnknownFrameworkReference">
<source>NETSDK1073: The FrameworkReference '{0}' was not recognized</source>
<target state="new">NETSDK1073: The FrameworkReference '{0}' was not recognized</target>
Expand Down Expand Up @@ -162,6 +177,11 @@
<target state="translated">NETSDK1018: Neplatný řetězec verze NuGet: {0}</target>
<note>{StrBegin="NETSDK1018: "}</note>
</trans-unit>
<trans-unit id="UnresolvedTargetingPack">
<source>NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</source>
<target state="new">NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</target>
<note>{StrBegin="NETSDK1081: "}</note>
</trans-unit>
<trans-unit id="UnsupportedFramework">
<source>NETSDK1019: {0} is an unsupported framework.</source>
<target state="translated">NETSDK1019: {0} není podporovaná architektura.</target>
Expand Down
20 changes: 20 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<target state="translated">NETSDK1069: Dieses Projekt verwendet eine Bibliothek, die auf .NET Standard 1.5 oder höher ausgerichtet ist, und das Projekt ist auf eine Version von .NET Framework ausgerichtet, die keine integrierte Unterstützung für diese .NET Standard-Version bietet. Besuchen Sie https://aka.ms/net-standard-known-issues for a set of known issues. Ziehen Sie eine neue Ausrichtung auf .NET Framework 4.7.2 in Betracht.</target>
<note>{StrBegin="NETSDK1069: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="new">NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</target>
<note>{StrBegin="NETSDK1084: "}</note>
</trans-unit>
<trans-unit id="NoCompatibleTargetFramework">
<source>NETSDK1002: Project '{0}' targets '{2}'. It cannot be referenced by a project that targets '{1}'.</source>
<target state="translated">NETSDK1002: Das Projekt "{0}" hat das Ziel "{2}". Ein Verweis über ein Projekt mit dem Ziel "{1}" ist nicht möglich.</target>
Expand Down Expand Up @@ -102,11 +107,21 @@
<target state="translated">NETSDK1008: Die Metadaten "{0}" für das Element "{2}" vom Typ "{1}" sind nicht vorhanden.</target>
<note>{StrBegin="NETSDK1008: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackAvailable">
<source>NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</source>
<target state="new">NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="PackageReferenceVersionNotRecommended">
<source>NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</source>
<target state="new">NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</target>
<note />
</trans-unit>
<trans-unit id="RuntimeIdentifierNotRecognized">
<source>NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</source>
<target state="new">NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</target>
<note>{StrBegin="NETSDK1083: "}</note>
</trans-unit>
<trans-unit id="UnknownFrameworkReference">
<source>NETSDK1073: The FrameworkReference '{0}' was not recognized</source>
<target state="new">NETSDK1073: The FrameworkReference '{0}' was not recognized</target>
Expand Down Expand Up @@ -162,6 +177,11 @@
<target state="translated">NETSDK1018: Ungültige NuGet-Versionszeichenfolge: "{0}".</target>
<note>{StrBegin="NETSDK1018: "}</note>
</trans-unit>
<trans-unit id="UnresolvedTargetingPack">
<source>NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</source>
<target state="new">NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</target>
<note>{StrBegin="NETSDK1081: "}</note>
</trans-unit>
<trans-unit id="UnsupportedFramework">
<source>NETSDK1019: {0} is an unsupported framework.</source>
<target state="translated">NETSDK1019: "{0}" ist ein nicht unterstütztes Framework.</target>
Expand Down
20 changes: 20 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<target state="translated">NETSDK1069: Este proyecto utiliza una biblioteca para .NET Standard 1.5 o posterior, pero el proyecto es para una versión de .NET Framework que no incluye compatibilidad con esa versión de .NET Standard. Visite https://aka.ms/net-standard-known-issues para ver un conjunto de problemas conocidos. Considere la posibilidad de cambiar el destino a .NET Framework 4.7.2.</target>
<note>{StrBegin="NETSDK1069: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="new">NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</target>
<note>{StrBegin="NETSDK1084: "}</note>
</trans-unit>
<trans-unit id="NoCompatibleTargetFramework">
<source>NETSDK1002: Project '{0}' targets '{2}'. It cannot be referenced by a project that targets '{1}'.</source>
<target state="translated">NETSDK1002: El proyecto "{0}" tiene como destino "{2}". No se puede hacer referencia a él mediante un proyecto que tenga como destino "{1}".</target>
Expand Down Expand Up @@ -102,11 +107,21 @@
<target state="translated">NETSDK1008: Faltan los metadatos de "{0}" en el elemento de "{1}" "{2}".</target>
<note>{StrBegin="NETSDK1008: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackAvailable">
<source>NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</source>
<target state="new">NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="PackageReferenceVersionNotRecommended">
<source>NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</source>
<target state="new">NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</target>
<note />
</trans-unit>
<trans-unit id="RuntimeIdentifierNotRecognized">
<source>NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</source>
<target state="new">NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</target>
<note>{StrBegin="NETSDK1083: "}</note>
</trans-unit>
<trans-unit id="UnknownFrameworkReference">
<source>NETSDK1073: The FrameworkReference '{0}' was not recognized</source>
<target state="new">NETSDK1073: The FrameworkReference '{0}' was not recognized</target>
Expand Down Expand Up @@ -162,6 +177,11 @@
<target state="translated">NETSDK1018: Cadena de versión de NuGet no válida: "{0}".</target>
<note>{StrBegin="NETSDK1018: "}</note>
</trans-unit>
<trans-unit id="UnresolvedTargetingPack">
<source>NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</source>
<target state="new">NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</target>
<note>{StrBegin="NETSDK1081: "}</note>
</trans-unit>
<trans-unit id="UnsupportedFramework">
<source>NETSDK1019: {0} is an unsupported framework.</source>
<target state="translated">NETSDK1019: {0} es una plataforma no compatible.</target>
Expand Down
20 changes: 20 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<target state="translated">NETSDK1069: Ce projet utilise une bibliothèque qui cible .NET Standard 1.5 ou ultérieur, et le projet cible une version du .NET Framework qui n'intègre pas la prise en charge de cette version de .NET Standard. Pour obtenir la liste des problèmes connus, visitez https://aka.ms/net-standard-known-issues. Songez à cibler le .NET Framework 4.7.2.</target>
<note>{StrBegin="NETSDK1069: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="new">NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</target>
<note>{StrBegin="NETSDK1084: "}</note>
</trans-unit>
<trans-unit id="NoCompatibleTargetFramework">
<source>NETSDK1002: Project '{0}' targets '{2}'. It cannot be referenced by a project that targets '{1}'.</source>
<target state="translated">NETSDK1002: Le projet '{0}' cible '{2}'. Il ne peut pas être référencé par un projet qui cible '{1}'.</target>
Expand Down Expand Up @@ -102,11 +107,21 @@
<target state="translated">NETSDK1008: Métadonnées '{0}' manquantes sur l'élément '{1}' '{2}'.</target>
<note>{StrBegin="NETSDK1008: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackAvailable">
<source>NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</source>
<target state="new">NETSDK1082: There was no runtime pack for {0} available for the specified RuntimeIdentifier '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="PackageReferenceVersionNotRecommended">
<source>NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</source>
<target state="new">NETSDK1071: A PackageReference to '{0}' specified a Version of `{1}`. Specifying the version of this package is not recommended. For more information, see https://aka.ms/sdkimplicitrefs</target>
<note />
</trans-unit>
<trans-unit id="RuntimeIdentifierNotRecognized">
<source>NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</source>
<target state="new">NETSDK1083: The specified RuntimeIdentifier '{0}' is not recognized.</target>
<note>{StrBegin="NETSDK1083: "}</note>
</trans-unit>
<trans-unit id="UnknownFrameworkReference">
<source>NETSDK1073: The FrameworkReference '{0}' was not recognized</source>
<target state="new">NETSDK1073: The FrameworkReference '{0}' was not recognized</target>
Expand Down Expand Up @@ -162,6 +177,11 @@
<target state="translated">NETSDK1018: Chaîne de version NuGet non valide : '{0}'.</target>
<note>{StrBegin="NETSDK1018: "}</note>
</trans-unit>
<trans-unit id="UnresolvedTargetingPack">
<source>NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</source>
<target state="new">NETSDK1081: The targeting pack for {0} was not found. You may be able to resolve this by running a NuGet restore on the project.</target>
<note>{StrBegin="NETSDK1081: "}</note>
</trans-unit>
<trans-unit id="UnsupportedFramework">
<source>NETSDK1019: {0} is an unsupported framework.</source>
<target state="translated">NETSDK1019: {0} est un framework non pris en charge.</target>
Expand Down
Loading