From cb1c31650b7f23d068bcca6b5e26a19c45f17780 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 27 Jun 2019 13:24:17 +1000 Subject: [PATCH 01/10] Remove redundant nullable directive --- .../Setup/SwrTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs index 259019c5b1e..e64ce4fb81b 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs @@ -11,8 +11,6 @@ using Xunit; using Xunit.Abstractions; -#nullable enable - namespace Microsoft.VisualStudio.Setup { public sealed class SwrTests From e003f29d81e71ad18aa145232c072f389198f952 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 21 Jun 2019 15:35:24 +1000 Subject: [PATCH 02/10] Add resources for generating images --- resources/ManagedImages.xcf | Bin 0 -> 10342 bytes resources/Overlay_Private_16x.png | Bin 0 -> 125 bytes resources/Overlay_Private_16x.xaml | 17 +++++++++++++++++ resources/Overlay_Warning_16x.png | Bin 0 -> 169 bytes resources/Overlay_Warning_16x.xaml | 17 +++++++++++++++++ resources/README.md | 3 +++ 6 files changed, 37 insertions(+) create mode 100644 resources/ManagedImages.xcf create mode 100644 resources/Overlay_Private_16x.png create mode 100644 resources/Overlay_Private_16x.xaml create mode 100644 resources/Overlay_Warning_16x.png create mode 100644 resources/Overlay_Warning_16x.xaml create mode 100644 resources/README.md diff --git a/resources/ManagedImages.xcf b/resources/ManagedImages.xcf new file mode 100644 index 0000000000000000000000000000000000000000..5d7e73da1524cc659bbbf276c6d4511491ceaa54 GIT binary patch literal 10342 zcmeHNeQX>@6`$Mt^jGYbq)llOU($p$NQs?P(EQ;zVy<;&~wucYZZ{E!C)Hp!&AmAo|$Ah0w0YVXo z2=FWg_yC^;+~UwwZy968kARoPVR~btGa8R=?2M(OZP9cTVum`Ny$#!YJ3GRMVyT`) zvTNJ=&711ihhtr>$+kpSeB1h#J@;+gx_*0Od4pDLEDwhp($RRhE7}>`w&vd6MEj=u z$@C_kNcS|wQoEy_-5s$tja$R`Yp6rj*;SO{1F^1n`oNmT&7Yr7?S~U>^Qzn&>q&MT zOrujRU5WIX#x2(|{*|J_n#Q~8>+3dON8yp#6dLM^V@1PU;~M^WD$%Bgp557#KHL!t z!_P$9hVnbxNtvjM96OQ`Dd@azPs_V#o~Tk)>L zn{`_d9xf$xWE&4+Jj02u)&sE~(oeRx_r%f#2TA){kuAAWmBzvKcptZ!z+*NJowRZJ zl#Q39Y<$x(8!vsr#`3dl`gu0))Fo80N>%F^|au&LB-BEf-KH4PCtClDyjXW#|WJ7CtB`hK@nt9_yJdADl;JW zI^{*$SCCz)lNYcpB=qu32!ne>h*^Rg!s4K$@No$|EjZ6`wU-8#Ll68VNpb#2Y$VZ5(WK@p>Gbh!6IcD1#{Y11ssk zkdI_!p%zr*6_jl&KQ6~BnA~Sbxv!kbap3VX@R(foAsfem#}TLd0^kGSfyZ4~$s;su zdW>%EpRxVGNu&EBmlS8AP-|*iSX95mlH0HAr5O znc+e#2<4$r#cM=0D`C#G%`E`UX)bGtpXrTHy)zmxhMnX zHs@VCs3Py;b<#KiQ|Yd&%TT>ioefB@8dFS_$V;Y{Nk5;#Lh6utkX1rTT7hW|^>RzN z7`u2z3US2Xxg)>ATH<9Fq&TA1*&|O9Ye^BnLaYdb%M9RsKS>=1I{;D80OMH89}!?M zBL*+x5o>TsA5FK9#1woajsLEXSf5M!n05O|Ou%w;T|XSRnxN4b0LfFzeTwScS|mR;l_o3~8MJg+~V#C0}_Y+1Z`! zigl%_WHHUtbSQQ`)vAMzK#zcvcGUx}inYr)3lzyze^h+6nyh6AO?#p0uyFM8Z z5>+vAN>ND(ONu1Pkz@h1V*#x%5y-L9E}2D_<{*_zv?df?GU1ZxxHNBiUM^*eF3mwI zmuOunx|D@WS;wV$(^tA=CxlLnB9?3kX41Lgnw6^jz7+01o=B#?Mscy2lEp~`9qu>3 zs3~Bb5Kf(&e_NsqqMP5*@;jKkP$uLBEF>YB3*zB461=Dv=t-p%!|$_ zwc^heN^=y_{{I>uO$u7&qfNm_BJ5u;hmVR~xR0c!bgwm#Dax-dEa_vGf?N4$Q}B@p z`&ap>*oFH@YRZ&t&ut)6lwV!w_=xRPAA9TC(@Nl>gF9l2ZnN}h9pyG&KF9pOe3tot zd13zd;acL7c#c0OSbx9K=j&JJ2MA}xv;4c&LjEPhtv}$_5J}W}=1i*}*`b&-Ql2Tz z6sxJT&GUxLKhM>@qmN^YJ2xo{)h+QSH2oSBE5#>X+ULZ=;Lyl^%(2XE9m$Mr#r4sM zAuo-vK%g?<_Zwcz$ly9DW6R}-A$fVU1vNh`mvR)Z0Eg4-fgH8#S}mg?X^plZJoV(P zPA|=|_E-vEu3{9oi)lkf_x-MC#TFN%N5EOSRyOhe$41*IjtG-#H45C%TT3(Bx3`#!*0Df@^7d?XyH7=HlP(_vr z4|csCNoqbvg|Jgyi##wNL>0mmq_y(@tJw|Ak7>|{p(gB}4sU{NnM-EZDMLN_?pS!8 z6xF`n_k4+Diz$>>QiqDq>br_`q3=#8uijOn45HO>E%z`lE=RFw;k7mG4X?_;EwbJjVGi4RP)`Z{z$$Ax=d&fAnP`CYlZY zLDSz)>}mS-5Pu2^6UUFY@Go+HTAX|7f?r&IZzt#dQwV*Yf8ei!IO8_`?J4@m`4+bH zgPeb(g*UyE$vlYt?YVac242o&1_q9u&k{d4oH=$hlNkp3afFV7R^~w;znpmx3Fdqu zs6mR{2wgEv-4)X;bj38$m8|O8;IMh@sA&!ZIbAWSE9MQ@m26gbC9B?oNpB^aMOXfH z-hM0DV@I>u;o+?AN|w5ky{aoyb%&qa#H#l^(bM3;k-HZ=RO>g>UYYyz2FB_tEAwwJ>-9_P7cW8Z_C~8x<|kNBNalWcUQVp-V*~V6-@R-t*?l0IinTSR zl8?t))!{>b?OaSLze=a8jn{p~#p}^u79af0(W4tT`NFGNnBj1at_=7l#S-xqIk{-ziNKsOQ>lg;sX^W^z>WKxLq zP5_cLlAaPf)1Y?<(MNor5Iex1jqDX?AKAP2k+Ye-k+X*Q=c&jum_s6`#54DtLIXmK zL|%WLbHE5v9sE@Hu3g;(2BxWtVq({>2?7JoPK(h|0Wk2XAcV@F^zDE3yE_%@e7WLDPCwgLiGL#4Rx7P7)0jb~x3E-&%;8^o pJg?$djwh?&QzX1#RWeflS literal 0 HcmV?d00001 diff --git a/resources/Overlay_Private_16x.png b/resources/Overlay_Private_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..14aeaa5953390f838cb122a4f115460bda2bf066 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0Yz!$?3!UkKew1i + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/Overlay_Warning_16x.png b/resources/Overlay_Warning_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..10ad543a760d7268ee9cecbe85bc39ddc5dd7d20 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=8QZ0K)k3X6Mgmv;JPU z`*%_P{~3ng4%3)`63it*e!&b0_dA~_*Z{fao-U3d9MQ=M3zz}|8!q(B>=a-NP8V)b zG^zopr E0Oh1Q6951J literal 0 HcmV?d00001 diff --git a/resources/Overlay_Warning_16x.xaml b/resources/Overlay_Warning_16x.xaml new file mode 100644 index 00000000000..b8546bd5a15 --- /dev/null +++ b/resources/Overlay_Warning_16x.xaml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/README.md b/resources/README.md new file mode 100644 index 00000000000..7d2277d523e --- /dev/null +++ b/resources/README.md @@ -0,0 +1,3 @@ +# Resources + +Files in this directory are used to generate images contained within the project. These files are not included in assemblies directly. \ No newline at end of file From 447146690cbd637d6edb445ee0070171daa6a503 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 25 Jun 2019 12:24:27 +1000 Subject: [PATCH 03/10] Add icons for FrameworkReference --- .../ManagedImages.imagemanifest | 21 +++++++++++++++++ ...sualStudio.ProjectSystem.Managed.VS.csproj | 15 ++++++++++++ .../Resources/Icons/FrameworkPrivate_16x.png | Bin 0 -> 189 bytes .../Resources/Icons/FrameworkPrivate_16x.xaml | 22 ++++++++++++++++++ .../Resources/Icons/FrameworkWarning_16x.png | Bin 0 -> 256 bytes .../Resources/Icons/FrameworkWarning_16x.xaml | 22 ++++++++++++++++++ .../Resources/Icons/Framework_16x.png | Bin 0 -> 162 bytes .../Resources/Icons/Framework_16x.xaml | 19 +++++++++++++++ .../PublicAPI.Unshipped.txt | 3 +++ .../Resources/ManagedImageMonikers.cs | 6 +++++ 10 files changed, 108 insertions(+) create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkPrivate_16x.png create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkPrivate_16x.xaml create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.png create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.xaml create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.png create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.xaml diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ManagedImages.imagemanifest b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ManagedImages.imagemanifest index 89b6c231ebb..db166f980e9 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ManagedImages.imagemanifest +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ManagedImages.imagemanifest @@ -27,6 +27,9 @@ + + + @@ -161,6 +164,24 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj index 00e2005cc0d..f865341d388 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj @@ -172,6 +172,18 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + @@ -194,6 +206,9 @@ + + + diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkPrivate_16x.png b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkPrivate_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..17a15cbc07640c1f557d5de2f902a17a87bab01a GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=3%>eEIh6o0F4MN=iyw zTib{CAAwxEci+2!a?B+`e!&a|??qdAj{v!Wo-U3d6>+&e8+jWHcv$XU+{`HC^C4)D zd)NjR<{ck?&GA_9Xw~K0|GyoN+Mw9JK)JFhT2$z)?$m{fT!mGWe>(rqjMY3+wsU%a hDrcjs;ZyI7yFK;NPmSH + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.png b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..9735fbd93d8c0af1b6151c10b622ad141b68aa1e GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Q-Dv1E0F&3<;yoD@c#^hlamur z;NM00uV26Zd^YRTr_XI|Z9tVj-t1hqY}w!Ib}wJPeDmf_N=nLy_aEmZ>z@M3v6Te* z1v3~V)ZKqS=eBk^P$b>c#WAEJuJ_zcz6Jvhmy4@X+w|W3`oBLbxbxw~-xW>`AJ#iw znY6I^%$Bs53-;({U6{srvoVEv65kEQ>~F$%xV*kv7df4}^4?1~Vnd$(30Jw52kTCK r&vfK|EwW}t1M7{&>=hDUb88r?=CfVhwzE4HXeEQEtDnm{r-UW|t^#<| literal 0 HcmV?d00001 diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.xaml new file mode 100644 index 00000000000..b6c70eb728a --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/FrameworkWarning_16x.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.png b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..5c2b86cdce64fa238849a7f57224d8e3e96a0472 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nVv3=Ar*1S5;YG_PuFL=zpu8M z|HyyN2j3O8O0YGk+`4t^pS7js!=nnO3R`dRFlhhy@J~68Cx|)dbi+dv8@2;64T%hs zE>GZf5L3U!AaE>|L1@_-)+@ZsT*-{P8Q%v71$FqbPg#CsAwL5*<4Kbh!nO;6mNIy{ L`njxgN@xNAg^4#U literal 0 HcmV?d00001 diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.xaml new file mode 100644 index 00000000000..4e0614ab378 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Resources/Icons/Framework_16x.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/PublicAPI.Unshipped.txt b/src/Microsoft.VisualStudio.ProjectSystem.Managed/PublicAPI.Unshipped.txt index d72e674b5dc..26b436ce6e4 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/PublicAPI.Unshipped.txt +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/PublicAPI.Unshipped.txt @@ -47,6 +47,9 @@ static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.Component.ge static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.ComponentPrivate.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.ComponentWarning.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.ErrorSmall.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker +static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.Framework.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker +static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.FrameworkPrivate.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker +static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.FrameworkWarning.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.LibraryWarning.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.NuGetGrey.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker static Microsoft.VisualStudio.ProjectSystem.VS.ManagedImageMonikers.NuGetGreyPrivate.get -> Microsoft.VisualStudio.Imaging.Interop.ImageMoniker diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources/ManagedImageMonikers.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources/ManagedImageMonikers.cs index a04d93bada4..f7cb2e42076 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources/ManagedImageMonikers.cs +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources/ManagedImageMonikers.cs @@ -45,6 +45,9 @@ public static class ManagedImageMonikers public static ImageMoniker SharedProjectPrivate => new ImageMoniker { Guid = s_manifestGuid, Id = 19 }; public static ImageMoniker SharedProjectWarning => new ImageMoniker { Guid = s_manifestGuid, Id = 20 }; public static ImageMoniker WarningSmall => new ImageMoniker { Guid = s_manifestGuid, Id = 21 }; + public static ImageMoniker Framework => new ImageMoniker { Guid = s_manifestGuid, Id = 22 }; + public static ImageMoniker FrameworkPrivate => new ImageMoniker { Guid = s_manifestGuid, Id = 23 }; + public static ImageMoniker FrameworkWarning => new ImageMoniker { Guid = s_manifestGuid, Id = 24 }; // These internal fields are provided for convenience @@ -116,6 +119,9 @@ private static string DebugDisplay(Guid guid, int id) case 19: return nameof(SharedProjectPrivate); case 20: return nameof(SharedProjectWarning); case 21: return nameof(WarningSmall); + case 22: return nameof(Framework); + case 23: return nameof(FrameworkPrivate); + case 24: return nameof(FrameworkWarning); } } From 543ef3480f606b682ddedd1644c7d36fbb48c9e5 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Tue, 25 Jun 2019 12:34:32 +1000 Subject: [PATCH 04/10] Dependencies node supports framework references --- docs/design-time-builds.md | 1 + .../CommonFiles.swr | 2 + ....VisualStudio.ProjectSystem.Managed.csproj | 16 ++++++ .../Microsoft.Managed.DesignTime.targets | 13 +++++ .../ProjectSystem/Rules/FrameworkReference.cs | 12 ++++ .../Rules/FrameworkReference.xaml | 27 +++++++++ .../Rules/ResolvedFrameworkReference.cs | 12 ++++ .../Rules/ResolvedFrameworkReference.xaml | 37 ++++++++++++ .../Resources.Designer.cs | 9 +++ .../Resources.resx | 3 + .../Tree/Dependencies/DependencyTreeFlags.cs | 3 + .../Models/FrameworkDependencyModel.cs | 46 +++++++++++++++ .../Tree/Dependencies/Snapshot/Dependency.cs | 1 + .../RuleHandlers/FrameworkRuleHandler.cs | 56 +++++++++++++++++++ .../xlf/Resources.cs.xlf | 5 ++ .../xlf/Resources.de.xlf | 5 ++ .../xlf/Resources.es.xlf | 5 ++ .../xlf/Resources.fr.xlf | 5 ++ .../xlf/Resources.it.xlf | 5 ++ .../xlf/Resources.ja.xlf | 5 ++ .../xlf/Resources.ko.xlf | 5 ++ .../xlf/Resources.pl.xlf | 5 ++ .../xlf/Resources.pt-BR.xlf | 5 ++ .../xlf/Resources.ru.xlf | 5 ++ .../xlf/Resources.tr.xlf | 5 ++ .../xlf/Resources.zh-Hans.xlf | 5 ++ .../xlf/Resources.zh-Hant.xlf | 5 ++ 27 files changed, 303 insertions(+) create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.cs create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.cs create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Models/FrameworkDependencyModel.cs create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Subscriptions/RuleHandlers/FrameworkRuleHandler.cs diff --git a/docs/design-time-builds.md b/docs/design-time-builds.md index 0ff7b1537d4..6763a1df886 100644 --- a/docs/design-time-builds.md +++ b/docs/design-time-builds.md @@ -20,6 +20,7 @@ Design-Time Target | Normal Target ResolveAssemblyReferencesDesignTime | ResolveAssemblyReferences | Resolves `` items to their paths. ResolveProjectReferencesDesignTime | ResolveProjectReferences | Resolves `` items to their output paths. ResolveComReferencesDesignTime | ResolveComReferences | Resolves `` items to their primary interop assemblies (PIA) paths. +ResolveFrameworkReferencesDesignTime | ResolveFrameworkReferences | Resolves `` items to their paths. ResolvePackageDependenciesDesignTime | ResolvePackageDependencies | Resolves `` items to their paths. CompileDesignTime (new project system)/Compile| Compile | Passes command-line arguments, `` items and `` items to the compiler in normal builds, or to the language service in design-time builds. diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr index 23e588cc8ac..8c700e51098 100644 --- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr +++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr @@ -40,6 +40,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed" file source="$(VisualStudioXamlRulesDir)EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)EmbeddedResource.xaml" file source="$(VisualStudioXamlRulesDir)Folder.xaml" + file source="$(VisualStudioXamlRulesDir)FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)FSharp.ProjectItemsSchema.xaml" file source="$(VisualStudioXamlRulesDir)GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)GeneralConfiguredBrowseObject.xaml" @@ -58,6 +59,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed" file source="$(VisualStudioXamlRulesDir)ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)ResolvedCOMReference.xaml" file source="$(VisualStudioXamlRulesDir)ResolvedCompilationReference.xaml" + file source="$(VisualStudioXamlRulesDir)ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)ResolvedSdkReference.xaml" diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj index d05e52e5ae5..6fc05a90f13 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj @@ -160,6 +160,12 @@ EditorConfigFiles.xaml + + FrameworkReference.xaml + + + ResolvedFrameworkReference.xaml + True True @@ -369,6 +375,16 @@ MSBuild:GenerateRuleSourceFromXaml Designer + + false + MSBuild:GenerateRuleSourceFromXaml + Designer + + + false + MSBuild:GenerateRuleSourceFromXaml + Designer + diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets index bc723e3415b..9fdf58daa5a 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets @@ -300,6 +300,14 @@ + + Project;BrowseObject + + + + ProjectSubscriptionService;BrowseObject + + ProjectSubscriptionService @@ -375,6 +383,11 @@ + + diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.cs new file mode 100644 index 00000000000..9e15f21d810 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.cs @@ -0,0 +1,12 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics.CodeAnalysis; + +namespace Microsoft.VisualStudio.ProjectSystem +{ + [ExcludeFromCodeCoverage] + [SuppressMessage("Style", "IDE0016:Use 'throw' expression")] + internal partial class FrameworkReference + { + } +} diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml new file mode 100644 index 00000000000..51764522c7c --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.cs new file mode 100644 index 00000000000..7ebc4173bca --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.cs @@ -0,0 +1,12 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics.CodeAnalysis; + +namespace Microsoft.VisualStudio.ProjectSystem +{ + [ExcludeFromCodeCoverage] + [SuppressMessage("Style", "IDE0016:Use 'throw' expression")] + internal partial class ResolvedFrameworkReference + { + } +} diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml new file mode 100644 index 00000000000..2803f965c61 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.Designer.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.Designer.cs index 251070d2d41..068f5c287ee 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.Designer.cs +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.Designer.cs @@ -105,6 +105,15 @@ internal static string FrameworkAssembliesNodeName { } } + /// + /// Looks up a localized string similar to Frameworks. + /// + internal static string FrameworkNodeName { + get { + return ResourceManager.GetString("FrameworkNodeName", resourceCulture); + } + } + /// /// Looks up a localized string similar to Errors in '{0}' need to be corrected before applying changes.. /// diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.resx b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.resx index 62450c75585..b6161a44213 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.resx +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Resources.resx @@ -155,4 +155,7 @@ SDK + + Frameworks + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/DependencyTreeFlags.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/DependencyTreeFlags.cs index f08c5084434..ee8c8f95687 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/DependencyTreeFlags.cs +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/DependencyTreeFlags.cs @@ -102,6 +102,9 @@ internal static readonly ProjectTreeFlags GenericResolvedDependencyFlags internal static readonly ProjectTreeFlags FrameworkAssembliesNode = ProjectTreeFlags.Create("FrameworkAssembliesNode"); internal static readonly ProjectTreeFlags FxAssemblyDependency = ProjectTreeFlags.Create("FxAssemblyDependency"); + internal static readonly ProjectTreeFlags FrameworkSubTreeRootNode = ProjectTreeFlags.Create("FrameworkSubTreeRootNode"); + internal static readonly ProjectTreeFlags FrameworkDependency = ProjectTreeFlags.Create("FrameworkDependency"); + internal static readonly ProjectTreeFlags ProjectSubTreeRootNode = ProjectTreeFlags.Create("ProjectSubTreeRootNode"); internal static readonly ProjectTreeFlags ProjectDependency = ProjectTreeFlags.Create("ProjectDependency"); diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Models/FrameworkDependencyModel.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Models/FrameworkDependencyModel.cs new file mode 100644 index 00000000000..6e807160650 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Models/FrameworkDependencyModel.cs @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Immutable; + +using Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.Snapshot; +using Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.Subscriptions.RuleHandlers; + +namespace Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.Models +{ + internal sealed class FrameworkDependencyModel : DependencyModel + { + private static readonly DependencyFlagCache s_flagCache = new DependencyFlagCache(add: DependencyTreeFlags.FrameworkDependency); + + private static readonly DependencyIconSet s_iconSet = new DependencyIconSet( + icon: ManagedImageMonikers.Framework, + expandedIcon: ManagedImageMonikers.Framework, + unresolvedIcon: ManagedImageMonikers.FrameworkWarning, + unresolvedExpandedIcon: ManagedImageMonikers.FrameworkWarning); + + public override DependencyIconSet IconSet => s_iconSet; + + public override int Priority => Dependency.FrameworkReferenceNodePriority; + + public override string ProviderType => FrameworkRuleHandler.ProviderTypeString; + + public override string? SchemaItemType => FrameworkReference.PrimaryDataSourceItemType; + + public override string? SchemaName => Resolved ? ResolvedFrameworkReference.SchemaName : FrameworkReference.SchemaName; + + public FrameworkDependencyModel( + string path, + string originalItemSpec, + bool isResolved, + IImmutableDictionary properties) + : base( + path, + originalItemSpec, + flags: s_flagCache.Get(isResolved, isImplicit: false), + isResolved, + isImplicit: false, + properties, + isTopLevel: true) + { + } + } +} diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Snapshot/Dependency.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Snapshot/Dependency.cs index ca7d74fd571..ef282b646eb 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Snapshot/Dependency.cs +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Snapshot/Dependency.cs @@ -25,6 +25,7 @@ internal sealed class Dependency : IDependency public const int AnalyzerNodePriority = 160; public const int ComNodePriority = 170; public const int SdkNodePriority = 180; + public const int FrameworkReferenceNodePriority = 190; public Dependency(IDependencyModel dependencyModel, ITargetFramework targetFramework, string containingProjectPath) { diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Subscriptions/RuleHandlers/FrameworkRuleHandler.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Subscriptions/RuleHandlers/FrameworkRuleHandler.cs new file mode 100644 index 00000000000..62dc728926f --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Tree/Dependencies/Subscriptions/RuleHandlers/FrameworkRuleHandler.cs @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Immutable; +using System.ComponentModel.Composition; + +using Microsoft.VisualStudio.Imaging.Interop; +using Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.CrossTarget; +using Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.Models; + +namespace Microsoft.VisualStudio.ProjectSystem.VS.Tree.Dependencies.Subscriptions.RuleHandlers +{ + [Export(DependencyRulesSubscriber.DependencyRulesSubscriberContract, typeof(IDependenciesRuleHandler))] + [Export(typeof(IProjectDependenciesSubTreeProvider))] + [AppliesTo(ProjectCapability.DependenciesTree)] + internal sealed class FrameworkRuleHandler : DependenciesRuleHandlerBase + { + public const string ProviderTypeString = "FrameworkDependency"; + + private static readonly DependencyIconSet s_iconSet = new DependencyIconSet( + icon: ManagedImageMonikers.Framework, + expandedIcon: ManagedImageMonikers.Framework, + unresolvedIcon: ManagedImageMonikers.FrameworkWarning, + unresolvedExpandedIcon: ManagedImageMonikers.FrameworkWarning); + + private static readonly SubTreeRootDependencyModel s_rootModel = new SubTreeRootDependencyModel( + ProviderTypeString, + Resources.FrameworkNodeName, + s_iconSet, + DependencyTreeFlags.FrameworkSubTreeRootNode); + + public FrameworkRuleHandler() + : base(FrameworkReference.SchemaName, ResolvedFrameworkReference.SchemaName) + { + } + + public override string ProviderType => ProviderTypeString; + + public override IDependencyModel CreateRootDependencyNode() => s_rootModel; + + protected override IDependencyModel CreateDependencyModel( + string path, + string originalItemSpec, + bool resolved, + bool isImplicit, + IImmutableDictionary properties) + { + return new FrameworkDependencyModel( + path, + originalItemSpec, + resolved, + properties); + } + + public override ImageMoniker GetImplicitIcon() => ManagedImageMonikers.FrameworkPrivate; + } +} diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.cs.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.cs.xlf index 8dcf7161dc2..e777c35bec9 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.cs.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.cs.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.de.xlf index f9d8f575162..fd2f6e2b83a 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.de.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.de.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.es.xlf index 0665f0a15b7..c9905030a39 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.es.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.es.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.fr.xlf index 8adb15b8a88..a73a2c1e7bc 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.fr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.fr.xlf @@ -62,6 +62,11 @@ Kit de développement logiciel + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.it.xlf index 8dd9113ba14..3f0873f5e70 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.it.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.it.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ja.xlf index 4f94f3e422a..33973400708 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ja.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ja.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ko.xlf index 50ef2fcf4f5..5030ba55933 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ko.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ko.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pl.xlf index 26de46b773f..c75b08ccbdc 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pl.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pl.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pt-BR.xlf index 55af8715dd5..45e631ecdd9 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pt-BR.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.pt-BR.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ru.xlf index 041e47e5dcf..e9452da0b70 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ru.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.ru.xlf @@ -62,6 +62,11 @@ ПАКЕТ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.tr.xlf index de60bad7ddf..8d9417529f0 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.tr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.tr.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hans.xlf index 2a019e9a0fb..6f88bec6488 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hans.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hans.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hant.xlf index cd91016302f..2b2f166f4af 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hant.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/xlf/Resources.zh-Hant.xlf @@ -62,6 +62,11 @@ SDK + + Frameworks + Frameworks + + \ No newline at end of file From 3be8403f50cabc775fdb0158e0a3f4084e3af363 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Wed, 26 Jun 2019 19:00:05 +1000 Subject: [PATCH 05/10] Update ResolveFrameworkReference rule properties --- .../Rules/ResolvedFrameworkReference.xaml | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml index 2803f965c61..2e2621a00ac 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml @@ -19,18 +19,38 @@ ReadOnly="True" Visible="False" /> - + + + + + - - + + + + + + From 9c3e1aa72dd3ddd5d4bd0c732473356c0e7825a8 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Wed, 26 Jun 2019 23:08:20 +1000 Subject: [PATCH 06/10] Add translations to setup file --- .../CommonFiles.swr | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr index 8c700e51098..ceda4f70e3e 100644 --- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr +++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr @@ -104,6 +104,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\cs" file source="$(VisualStudioXamlRulesDir)cs\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)cs\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)cs\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)cs\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)cs\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)cs\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)cs\ResolvedSdkReference.xaml" @@ -143,6 +144,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\de" file source="$(VisualStudioXamlRulesDir)de\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)de\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)de\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)de\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)de\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)de\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)de\ResolvedSdkReference.xaml" @@ -182,6 +184,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\es" file source="$(VisualStudioXamlRulesDir)es\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)es\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)es\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)es\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)es\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)es\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)es\ResolvedSdkReference.xaml" @@ -221,6 +224,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\fr" file source="$(VisualStudioXamlRulesDir)fr\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)fr\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)fr\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)fr\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)fr\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)fr\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)fr\ResolvedSdkReference.xaml" @@ -260,6 +264,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\it" file source="$(VisualStudioXamlRulesDir)it\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)it\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)it\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)it\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)it\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)it\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)it\ResolvedSdkReference.xaml" @@ -299,6 +304,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\ja" file source="$(VisualStudioXamlRulesDir)ja\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)ja\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)ja\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)ja\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ja\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)ja\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)ja\ResolvedSdkReference.xaml" @@ -338,6 +344,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\ko" file source="$(VisualStudioXamlRulesDir)ko\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)ko\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)ko\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)ko\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ko\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)ko\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)ko\ResolvedSdkReference.xaml" @@ -377,6 +384,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\pl" file source="$(VisualStudioXamlRulesDir)pl\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)pl\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)pl\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)pl\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)pl\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)pl\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)pl\ResolvedSdkReference.xaml" @@ -416,6 +424,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\pt-BR" file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\ResolvedSdkReference.xaml" @@ -455,6 +464,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\ru" file source="$(VisualStudioXamlRulesDir)ru\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)ru\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)ru\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)ru\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ru\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)ru\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)ru\ResolvedSdkReference.xaml" @@ -494,6 +504,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\tr" file source="$(VisualStudioXamlRulesDir)tr\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)tr\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)tr\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)tr\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)tr\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)tr\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)tr\ResolvedSdkReference.xaml" @@ -533,6 +544,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hans" file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\ResolvedSdkReference.xaml" @@ -572,6 +584,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hant" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedAnalyzerReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedAssemblyReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedCOMReference.xaml" + file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedFrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedPackageReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedSdkReference.xaml" From b6068d29c9b27d681d14268a1dba1a3a75a98023 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Wed, 26 Jun 2019 23:21:56 +1000 Subject: [PATCH 07/10] Localise FrameworkReference and ResolvedFrameworkReference --- .../CommonFiles.swr | 13 +++++ ....VisualStudio.ProjectSystem.Managed.csproj | 2 - .../Microsoft.Managed.DesignTime.targets | 4 +- .../Rules/xlf/FrameworkReference.xaml.cs.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.de.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.es.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.fr.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.it.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.ja.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.ko.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.pl.xlf | 22 +++++++ .../xlf/FrameworkReference.xaml.pt-BR.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.ru.xlf | 22 +++++++ .../Rules/xlf/FrameworkReference.xaml.tr.xlf | 22 +++++++ .../xlf/FrameworkReference.xaml.zh-Hans.xlf | 22 +++++++ .../xlf/FrameworkReference.xaml.zh-Hant.xlf | 22 +++++++ .../ResolvedFrameworkReference.xaml.cs.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.de.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.es.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.fr.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.it.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.ja.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.ko.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.pl.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.pt-BR.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.ru.xlf | 57 +++++++++++++++++++ .../ResolvedFrameworkReference.xaml.tr.xlf | 57 +++++++++++++++++++ ...esolvedFrameworkReference.xaml.zh-Hans.xlf | 57 +++++++++++++++++++ ...esolvedFrameworkReference.xaml.zh-Hant.xlf | 57 +++++++++++++++++++ 29 files changed, 1042 insertions(+), 4 deletions(-) create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.cs.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.de.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.es.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.fr.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.it.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ja.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ko.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pl.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pt-BR.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ru.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.tr.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hans.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hant.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf create mode 100644 src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr index ceda4f70e3e..6d05f75fe70 100644 --- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr +++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr @@ -93,6 +93,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\cs" file source="$(VisualStudioXamlRulesDir)cs\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)cs\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)cs\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)cs\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)cs\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)cs\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)cs\None.BrowseObject.xaml" @@ -133,6 +134,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\de" file source="$(VisualStudioXamlRulesDir)de\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)de\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)de\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)de\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)de\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)de\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)de\None.BrowseObject.xaml" @@ -173,6 +175,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\es" file source="$(VisualStudioXamlRulesDir)es\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)es\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)es\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)es\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)es\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)es\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)es\None.BrowseObject.xaml" @@ -213,6 +216,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\fr" file source="$(VisualStudioXamlRulesDir)fr\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)fr\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)fr\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)fr\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)fr\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)fr\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)fr\None.BrowseObject.xaml" @@ -253,6 +257,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\it" file source="$(VisualStudioXamlRulesDir)it\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)it\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)it\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)it\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)it\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)it\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)it\None.BrowseObject.xaml" @@ -293,6 +298,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\ja" file source="$(VisualStudioXamlRulesDir)ja\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ja\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ja\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)ja\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ja\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ja\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ja\None.BrowseObject.xaml" @@ -333,6 +339,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\ko" file source="$(VisualStudioXamlRulesDir)ko\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ko\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ko\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)ko\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ko\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ko\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ko\None.BrowseObject.xaml" @@ -373,6 +380,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\pl" file source="$(VisualStudioXamlRulesDir)pl\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pl\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pl\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)pl\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)pl\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pl\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pl\None.BrowseObject.xaml" @@ -413,6 +421,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\pt-BR" file source="$(VisualStudioXamlRulesDir)pt-BR\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)pt-BR\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)pt-BR\None.BrowseObject.xaml" @@ -453,6 +462,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\ru" file source="$(VisualStudioXamlRulesDir)ru\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ru\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ru\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)ru\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)ru\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ru\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)ru\None.BrowseObject.xaml" @@ -493,6 +503,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\tr" file source="$(VisualStudioXamlRulesDir)tr\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)tr\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)tr\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)tr\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)tr\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)tr\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)tr\None.BrowseObject.xaml" @@ -533,6 +544,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hans" file source="$(VisualStudioXamlRulesDir)zh-Hans\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)zh-Hans\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hans\None.BrowseObject.xaml" @@ -573,6 +585,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hant" file source="$(VisualStudioXamlRulesDir)zh-Hant\EditorConfigFiles.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\EmbeddedResource.BrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\Folder.xaml" + file source="$(VisualStudioXamlRulesDir)zh-Hant\FrameworkReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\GeneralBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\GeneralConfiguredBrowseObject.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\None.BrowseObject.xaml" diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj index 6fc05a90f13..cec138be63e 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj @@ -376,12 +376,10 @@ Designer - false MSBuild:GenerateRuleSourceFromXaml Designer - false MSBuild:GenerateRuleSourceFromXaml Designer diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets index 9fdf58daa5a..11ebabc9e9f 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets @@ -300,11 +300,11 @@ - + Project;BrowseObject - + ProjectSubscriptionService;BrowseObject diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.cs.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.cs.xlf new file mode 100644 index 00000000000..fd221b893d9 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.cs.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.de.xlf new file mode 100644 index 00000000000..755937e470a --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.de.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.es.xlf new file mode 100644 index 00000000000..3147ccd9250 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.es.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.fr.xlf new file mode 100644 index 00000000000..63896916fea --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.fr.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.it.xlf new file mode 100644 index 00000000000..84786d6d1b6 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.it.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ja.xlf new file mode 100644 index 00000000000..f007c69a0b6 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ja.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ko.xlf new file mode 100644 index 00000000000..2bdbfbb6033 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ko.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pl.xlf new file mode 100644 index 00000000000..bcff15f15ac --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pl.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pt-BR.xlf new file mode 100644 index 00000000000..90bf4424353 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.pt-BR.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ru.xlf new file mode 100644 index 00000000000..c002381f6a2 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.ru.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.tr.xlf new file mode 100644 index 00000000000..8ffeda63691 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.tr.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hans.xlf new file mode 100644 index 00000000000..1eae2f13157 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hans.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hant.xlf new file mode 100644 index 00000000000..8027e679116 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/FrameworkReference.xaml.zh-Hant.xlf @@ -0,0 +1,22 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf new file mode 100644 index 00000000000..77450031a8e --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf new file mode 100644 index 00000000000..5e849a9ed89 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf new file mode 100644 index 00000000000..2b666801b38 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf new file mode 100644 index 00000000000..c519446835b --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf new file mode 100644 index 00000000000..4747ac0fcca --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf new file mode 100644 index 00000000000..24fdde5f92e --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf new file mode 100644 index 00000000000..113e2cd792d --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf new file mode 100644 index 00000000000..ddae4ad56f0 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf new file mode 100644 index 00000000000..5f5e6703df3 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf new file mode 100644 index 00000000000..1fb38b3a684 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf new file mode 100644 index 00000000000..b133f87aa6a --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf new file mode 100644 index 00000000000..48da6af2464 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf new file mode 100644 index 00000000000..694605ed1d5 --- /dev/null +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf @@ -0,0 +1,57 @@ + + + + + + Framework Reference Properties + Framework Reference Properties + + + + Framework Reference + Framework Reference + + + + Targeting Pack Path + Targeting Pack Path + + + + Targeting Pack Name + Targeting Pack Name + + + + Targeting Pack Version + Targeting Pack Version + + + + Profile + Profile + + + + Runtime Pack Path + Runtime Pack Path + + + + Runtime Pack Name + Runtime Pack Name + + + + Runtime Pack Version + Runtime Pack Version + + + + Private Assets + Private Assets + + + + + \ No newline at end of file From 1c8ffce8efbbda0c97797f7cd13bd615317ed03e Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Thu, 27 Jun 2019 13:38:22 +1000 Subject: [PATCH 08/10] Remove some properties from ResolvedFrameworkReference --- .../ProjectSystem/Rules/FrameworkReference.xaml | 4 ---- .../Rules/ResolvedFrameworkReference.xaml | 12 ------------ .../xlf/ResolvedFrameworkReference.xaml.cs.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.de.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.es.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.fr.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.it.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.ja.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.ko.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.pl.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.ru.xlf | 15 --------------- .../xlf/ResolvedFrameworkReference.xaml.tr.xlf | 15 --------------- .../ResolvedFrameworkReference.xaml.zh-Hans.xlf | 15 --------------- .../ResolvedFrameworkReference.xaml.zh-Hant.xlf | 15 --------------- 15 files changed, 211 deletions(-) diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml index 51764522c7c..e88d47e62a9 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/FrameworkReference.xaml @@ -13,10 +13,6 @@ SourceOfDefaultValue="AfterContext" /> - - diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml index 2e2621a00ac..08906a896e9 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml @@ -35,18 +35,6 @@ DisplayName="Profile" ReadOnly="True" /> - - - - - - diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf index 77450031a8e..5ce67cd6342 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.cs.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf index 5e849a9ed89..0cc1b37da6f 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf index 2b666801b38..a01025723db 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf index c519446835b..3c5b7d72805 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf index 4747ac0fcca..acae6d20865 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf index 24fdde5f92e..6de5ab94754 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf index 113e2cd792d..58860a4f6ed 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf index ddae4ad56f0..709a1950f61 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf index 5f5e6703df3..d2dd34acd5b 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf index 1fb38b3a684..5cba348f767 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf index b133f87aa6a..b663c5a3773 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf index 48da6af2464..308777a35c3 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf index 694605ed1d5..131c0ffdcba 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf @@ -32,21 +32,6 @@ Profile - - Runtime Pack Path - Runtime Pack Path - - - - Runtime Pack Name - Runtime Pack Name - - - - Runtime Pack Version - Runtime Pack Version - - Private Assets Private Assets From 2c252c9bbd229538a7859b44b97b8d9dbf09a536 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 28 Jun 2019 14:49:50 +1000 Subject: [PATCH 09/10] Populate metadata on 'fake' ResolvedFrameworkReference items --- .../Microsoft.Managed.DesignTime.targets | 19 +++++++++++++++++-- .../Rules/ResolvedFrameworkReference.xaml | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets index 11ebabc9e9f..c12053730ee 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets @@ -385,8 +385,23 @@ + Returns="@(_ResolvedFrameworkReference)" + DependsOnTargets="ResolveFrameworkReferences"> + + + + <_ResolvedFrameworkReference Include="@(FrameworkReference)"> + %(FrameworkReference.ItemSpec) + c:\some\path + + + + diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml index 08906a896e9..fed8d2eeb77 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml @@ -8,7 +8,7 @@ Date: Fri, 28 Jun 2019 14:50:26 +1000 Subject: [PATCH 10/10] Simplify ResolvedFrameworkReference metadata Removes a few properties, and simplifies the "path" display name. --- ProjectSystem.sln | 1 + .../Rules/ResolvedFrameworkReference.xaml | 10 +--------- .../xlf/ResolvedFrameworkReference.xaml.cs.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.de.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.es.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.fr.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.it.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.ja.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.ko.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.pl.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.ru.xlf | 14 ++------------ .../xlf/ResolvedFrameworkReference.xaml.tr.xlf | 14 ++------------ .../ResolvedFrameworkReference.xaml.zh-Hans.xlf | 14 ++------------ .../ResolvedFrameworkReference.xaml.zh-Hant.xlf | 14 ++------------ 15 files changed, 28 insertions(+), 165 deletions(-) diff --git a/ProjectSystem.sln b/ProjectSystem.sln index d8ce17110c4..19190a3d2d5 100644 --- a/ProjectSystem.sln +++ b/ProjectSystem.sln @@ -34,6 +34,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DD7EF107-AAD4-4C43-8A58-0DC1BC614ADE}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + .vsts-ci.yml = .vsts-ci.yml build\Packages.targets = build\Packages.targets build\SignToolData.json = build\SignToolData.json build\Versions.props = build\Versions.props diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml index fed8d2eeb77..fbc5fd4a483 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedFrameworkReference.xaml @@ -20,15 +20,7 @@ Visible="False" /> - - - - - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf index 0cc1b37da6f..5bd210bd895 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.de.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf index a01025723db..2de86d7f514 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.es.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf index 3c5b7d72805..7ff5f65866a 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.fr.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf index acae6d20865..1e75ff1429f 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.it.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf index 6de5ab94754..780fa542530 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ja.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf index 58860a4f6ed..674672c20c3 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ko.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf index 709a1950f61..9b5cffd9283 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pl.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf index d2dd34acd5b..c3caecebacb 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.pt-BR.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf index 5cba348f767..18af24f440b 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.ru.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf index b663c5a3773..719606dd7e0 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.tr.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf index 308777a35c3..5afc236bcbe 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hans.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf index 131c0ffdcba..f5cdeccf528 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/ResolvedFrameworkReference.xaml.zh-Hant.xlf @@ -13,18 +13,8 @@ - Targeting Pack Path - Targeting Pack Path - - - - Targeting Pack Name - Targeting Pack Name - - - - Targeting Pack Version - Targeting Pack Version + Path + Path