Incorporate breaking changes from CPS

This commit is contained in:
Ryan Nowak 2018-10-08 10:55:59 -07:00
parent 7177a7311f
commit 4d44639a51
8 changed files with 1179 additions and 899 deletions

View File

@ -29,9 +29,9 @@
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioLanguageIntellisensePackageVersion> <MicrosoftVisualStudioLanguageIntellisensePackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
<MicrosoftVisualStudioLanguagePackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioLanguagePackageVersion> <MicrosoftVisualStudioLanguagePackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioLanguagePackageVersion>
<MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6071</MicrosoftVisualStudioOLEInteropPackageVersion> <MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6071</MicrosoftVisualStudioOLEInteropPackageVersion>
<MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>15.8.243</MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion> <MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>
<MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>2.0.6142705</MicrosoftVisualStudioProjectSystemManagedVSPackageVersion> <MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>2.0.6142705</MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>
<MicrosoftVisualStudioProjectSystemSDKPackageVersion>15.8.243</MicrosoftVisualStudioProjectSystemSDKPackageVersion> <MicrosoftVisualStudioProjectSystemSDKPackageVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemSDKPackageVersion>
<MicrosoftVisualStudioShell150PackageVersion>15.8.28010</MicrosoftVisualStudioShell150PackageVersion> <MicrosoftVisualStudioShell150PackageVersion>15.8.28010</MicrosoftVisualStudioShell150PackageVersion>
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30320</MicrosoftVisualStudioShellInterop100PackageVersion> <MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30320</MicrosoftVisualStudioShellInterop100PackageVersion>
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61031</MicrosoftVisualStudioShellInterop110PackageVersion> <MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61031</MicrosoftVisualStudioShellInterop110PackageVersion>

View File

@ -11,7 +11,8 @@
https://dotnet.myget.org/F/msbuild/api/v3/index.json; https://dotnet.myget.org/F/msbuild/api/v3/index.json;
https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json;
https://vside.myget.org/F/vssdk/api/v3/index.json; https://vside.myget.org/F/vssdk/api/v3/index.json;
https://vside.myget.org/F/vsmac/api/v3/index.json https://vside.myget.org/F/vsmac/api/v3/index.json;
https://vside.myget.org/F/devcore/api/v3/index.json;
</RestoreSources> </RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'"> <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources); $(RestoreSources);

View File

@ -13,7 +13,6 @@
<DefineConstants>$(DefineConstants);RAZOR_EXTENSION_DEVELOPER_MODE</DefineConstants> <DefineConstants>$(DefineConstants);RAZOR_EXTENSION_DEVELOPER_MODE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" /> <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" /> <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
@ -24,6 +23,7 @@
<PackageReference Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion)" /> <PackageReference Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion)" /> <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="$(MicrosoftVisualStudioOLEInteropPackageVersion)" /> <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="$(MicrosoftVisualStudioOLEInteropPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Analyzers" Version="$(MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed.VS" Version="$(MicrosoftVisualStudioProjectSystemManagedVSPackageVersion)" /> <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed.VS" Version="$(MicrosoftVisualStudioProjectSystemManagedVSPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK" Version="$(MicrosoftVisualStudioProjectSystemSDKPackageVersion)" /> <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK" Version="$(MicrosoftVisualStudioProjectSystemSDKPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150PackageVersion)" /> <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150PackageVersion)" />

View File

@ -8,10 +8,12 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules { namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
{
internal partial class RazorConfiguration { internal partial class RazorConfiguration
{
/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary> /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule; private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
@ -53,14 +55,17 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
private object locker = new object(); private object locker = new object();
/// <summary>Initializes a new instance of the RazorConfiguration class.</summary> /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) { internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
{
this.rule = rule; this.rule = rule;
} }
/// <summary>Initializes a new instance of the RazorConfiguration class.</summary> /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) :
this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) { this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
if ((configuredProject == null)) { {
if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -72,11 +77,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorConfiguration class.</summary> /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) :
this(rule) { this(rule)
if ((rule == null)) { {
if ((rule == null))
{
throw new System.ArgumentNullException("rule"); throw new System.ArgumentNullException("rule");
} }
if ((configuredProject == null)) { if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -88,34 +96,43 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorConfiguration class.</summary> /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) :
this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) { this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
{
} }
/// <summary>Initializes a new instance of the RazorConfiguration class that assumes a project context (neither property sheet nor items).</summary> /// <summary>Initializes a new instance of the RazorConfiguration class that assumes a project context (neither property sheet nor items).</summary>
internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) :
this(configuredProject, catalogs, "Project", null, null, null) { this(configuredProject, catalogs, "Project", null, null, null)
{
} }
/// <summary>Gets the IRule used to get and set properties.</summary> /// <summary>Gets the IRule used to get and set properties.</summary>
public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule { public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
get { {
get
{
return this.rule; return this.rule;
} }
} }
/// <summary>Razor Extensions</summary> /// <summary>Razor Extensions</summary>
internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty Extensions { internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty Extensions
get { {
get
{
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
if ((localRule == null)) { if ((localRule == null))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
} }
if ((localRule == null)) { if ((localRule == null))
{
return null; return null;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty))); Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
if (((property == null) if (((property == null)
&& (this.GeneratedFallbackRule != null))) { && (this.GeneratedFallbackRule != null)))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty))); property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
} }
@ -124,17 +141,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary> /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule { private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
get { {
get
{
if (((this.fallbackRule == null) if (((this.fallbackRule == null)
&& (this.configuredProject != null))) { && (this.configuredProject != null)))
{
System.Threading.Monitor.Enter(this.locker); System.Threading.Monitor.Enter(this.locker);
try { try
if ((this.fallbackRule == null)) { {
if ((this.fallbackRule == null))
{
this.InitializeFallbackRule(); this.InitializeFallbackRule();
} }
} }
finally { finally
{
System.Threading.Monitor.Exit(this.locker); System.Threading.Monitor.Exit(this.locker);
} }
} }
@ -142,48 +165,61 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) { private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
if ((catalog == null)) { {
if ((catalog == null))
{
return null; return null;
} }
return catalog.BindToContext(SchemaName, file, itemType, itemName); return catalog.BindToContext(SchemaName, file, itemType, itemName);
} }
private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) { private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
if ((propertiesContext.IsProjectFile == true)) { {
if ((propertiesContext.IsProjectFile == true))
{
return null; return null;
} }
else { else
{
return propertiesContext.File; return propertiesContext.File;
} }
} }
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
if ((this.configuredProject == null))
{
return; return;
} }
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule;
if ((unboundRule == null)) { if ((unboundRule == null))
{
System.IO.Stream xamlStream = null; System.IO.Stream xamlStream = null;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
try { try
{
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml"); xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml");
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
for ( for (
; ((unboundRule == null) ; ((unboundRule == null)
&& ruleEnumerator.MoveNext()); && ruleEnumerator.MoveNext());
) { )
{
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
{
unboundRule = t; unboundRule = t;
unboundRule.Name = "30e71838-2cb8-4c67-ab28-7670763124af"; unboundRule.Name = "f269edfbdecc0079d5f539c22552711e194f39b2367903515ae5440a64b20a0f";
RazorConfiguration.deserializedFallbackRule = unboundRule; RazorConfiguration.deserializedFallbackRule = unboundRule;
} }
} }
} }
finally { finally
if ((xamlStream != null)) { {
if ((xamlStream != null))
{
((System.IDisposable)(xamlStream)).Dispose(); ((System.IDisposable)(xamlStream)).Dispose();
} }
} }
@ -194,19 +230,46 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
internal partial class RazorProjectProperties { internal partial class RazorProjectProperties
{
private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration> CreateRazorConfigurationPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration>(CreateRazorConfigurationProperties); private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration> CreateRazorConfigurationPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration>(CreateRazorConfigurationProperties);
private static RazorConfiguration CreateRazorConfigurationProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) { private static RazorConfiguration CreateRazorConfigurationProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
{
RazorProjectProperties that = ((RazorProjectProperties)(state)); RazorProjectProperties that = ((RazorProjectProperties)(state));
return new RazorConfiguration(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); return new RazorConfiguration(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
} }
/// <summary>Gets the strongly-typed property accessor used to get and set Configuration Properties properties.</summary> /// <summary>Gets the strongly-typed property accessor used to get and set Configuration Properties properties.</summary>
internal System.Threading.Tasks.Task<RazorConfiguration> GetRazorConfigurationPropertiesAsync() { internal System.Threading.Tasks.Task<RazorConfiguration> GetRazorConfigurationPropertiesAsync()
{
System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync(); System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
return namedCatalogsTask.ContinueWith(CreateRazorConfigurationPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); return namedCatalogsTask.ContinueWith(CreateRazorConfigurationPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
} }
/// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Configuration Properties properties.</summary>
internal bool TryGetCurrentRazorConfigurationPropertiesSnapshot(out RazorConfiguration snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
{
snapshot = null;
Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
{
if (requiredToMatchProjectVersion)
{
if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
{
return false;
}
}
Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorConfiguration.SchemaName);
if ((rule != null))
{
snapshot = new RazorConfiguration(rule, this.ConfiguredProject);
return true;
}
}
return false;
}
} }
} }

View File

@ -8,10 +8,12 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules { namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
{
internal partial class RazorExtension { internal partial class RazorExtension
{
/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary> /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule; private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
@ -56,14 +58,17 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
private object locker = new object(); private object locker = new object();
/// <summary>Initializes a new instance of the RazorExtension class.</summary> /// <summary>Initializes a new instance of the RazorExtension class.</summary>
internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) { internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
{
this.rule = rule; this.rule = rule;
} }
/// <summary>Initializes a new instance of the RazorExtension class.</summary> /// <summary>Initializes a new instance of the RazorExtension class.</summary>
internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) :
this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) { this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
if ((configuredProject == null)) { {
if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -75,11 +80,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorExtension class.</summary> /// <summary>Initializes a new instance of the RazorExtension class.</summary>
internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) :
this(rule) { this(rule)
if ((rule == null)) { {
if ((rule == null))
{
throw new System.ArgumentNullException("rule"); throw new System.ArgumentNullException("rule");
} }
if ((configuredProject == null)) { if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -91,34 +99,43 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorExtension class.</summary> /// <summary>Initializes a new instance of the RazorExtension class.</summary>
internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) :
this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) { this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
{
} }
/// <summary>Initializes a new instance of the RazorExtension class that assumes a project context (neither property sheet nor items).</summary> /// <summary>Initializes a new instance of the RazorExtension class that assumes a project context (neither property sheet nor items).</summary>
internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) :
this(configuredProject, catalogs, "Project", null, null, null) { this(configuredProject, catalogs, "Project", null, null, null)
{
} }
/// <summary>Gets the IRule used to get and set properties.</summary> /// <summary>Gets the IRule used to get and set properties.</summary>
public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule { public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
get { {
get
{
return this.rule; return this.rule;
} }
} }
/// <summary>Razor Extension Assembly Name</summary> /// <summary>Razor Extension Assembly Name</summary>
internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyName { internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyName
get { {
get
{
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
if ((localRule == null)) { if ((localRule == null))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
} }
if ((localRule == null)) { if ((localRule == null))
{
return null; return null;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty))); Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
if (((property == null) if (((property == null)
&& (this.GeneratedFallbackRule != null))) { && (this.GeneratedFallbackRule != null)))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty))); property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
} }
@ -127,18 +144,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
/// <summary>Razor Extension Assembly File Path</summary> /// <summary>Razor Extension Assembly File Path</summary>
internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyFilePath { internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyFilePath
get { {
get
{
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
if ((localRule == null)) { if ((localRule == null))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
} }
if ((localRule == null)) { if ((localRule == null))
{
return null; return null;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty))); Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
if (((property == null) if (((property == null)
&& (this.GeneratedFallbackRule != null))) { && (this.GeneratedFallbackRule != null)))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty))); property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
} }
@ -147,17 +169,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary> /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule { private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
get { {
get
{
if (((this.fallbackRule == null) if (((this.fallbackRule == null)
&& (this.configuredProject != null))) { && (this.configuredProject != null)))
{
System.Threading.Monitor.Enter(this.locker); System.Threading.Monitor.Enter(this.locker);
try { try
if ((this.fallbackRule == null)) { {
if ((this.fallbackRule == null))
{
this.InitializeFallbackRule(); this.InitializeFallbackRule();
} }
} }
finally { finally
{
System.Threading.Monitor.Exit(this.locker); System.Threading.Monitor.Exit(this.locker);
} }
} }
@ -165,48 +193,61 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) { private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
if ((catalog == null)) { {
if ((catalog == null))
{
return null; return null;
} }
return catalog.BindToContext(SchemaName, file, itemType, itemName); return catalog.BindToContext(SchemaName, file, itemType, itemName);
} }
private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) { private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
if ((propertiesContext.IsProjectFile == true)) { {
if ((propertiesContext.IsProjectFile == true))
{
return null; return null;
} }
else { else
{
return propertiesContext.File; return propertiesContext.File;
} }
} }
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
if ((this.configuredProject == null))
{
return; return;
} }
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule;
if ((unboundRule == null)) { if ((unboundRule == null))
{
System.IO.Stream xamlStream = null; System.IO.Stream xamlStream = null;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
try { try
{
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml"); xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml");
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
for ( for (
; ((unboundRule == null) ; ((unboundRule == null)
&& ruleEnumerator.MoveNext()); && ruleEnumerator.MoveNext());
) { )
{
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
{
unboundRule = t; unboundRule = t;
unboundRule.Name = "6b577687-703b-41a1-8f5f-c44644f65f2a"; unboundRule.Name = "e8ad5dd707beca947f7c014baa70b46c1d7a7fd6c8b49a5511ab299d8e1a3c70";
RazorExtension.deserializedFallbackRule = unboundRule; RazorExtension.deserializedFallbackRule = unboundRule;
} }
} }
} }
finally { finally
if ((xamlStream != null)) { {
if ((xamlStream != null))
{
((System.IDisposable)(xamlStream)).Dispose(); ((System.IDisposable)(xamlStream)).Dispose();
} }
} }
@ -217,19 +258,46 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
internal partial class RazorProjectProperties { internal partial class RazorProjectProperties
{
private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension> CreateRazorExtensionPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension>(CreateRazorExtensionProperties); private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension> CreateRazorExtensionPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension>(CreateRazorExtensionProperties);
private static RazorExtension CreateRazorExtensionProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) { private static RazorExtension CreateRazorExtensionProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
{
RazorProjectProperties that = ((RazorProjectProperties)(state)); RazorProjectProperties that = ((RazorProjectProperties)(state));
return new RazorExtension(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); return new RazorExtension(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
} }
/// <summary>Gets the strongly-typed property accessor used to get and set Extension Properties properties.</summary> /// <summary>Gets the strongly-typed property accessor used to get and set Extension Properties properties.</summary>
internal System.Threading.Tasks.Task<RazorExtension> GetRazorExtensionPropertiesAsync() { internal System.Threading.Tasks.Task<RazorExtension> GetRazorExtensionPropertiesAsync()
{
System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync(); System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
return namedCatalogsTask.ContinueWith(CreateRazorExtensionPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); return namedCatalogsTask.ContinueWith(CreateRazorExtensionPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
} }
/// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Extension Properties properties.</summary>
internal bool TryGetCurrentRazorExtensionPropertiesSnapshot(out RazorExtension snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
{
snapshot = null;
Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
{
if (requiredToMatchProjectVersion)
{
if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
{
return false;
}
}
Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorExtension.SchemaName);
if ((rule != null))
{
snapshot = new RazorExtension(rule, this.ConfiguredProject);
return true;
}
}
return false;
}
} }
} }

View File

@ -8,10 +8,12 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules { namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
{
internal partial class RazorGeneral { internal partial class RazorGeneral
{
/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary> /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule; private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
@ -56,14 +58,17 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
private object locker = new object(); private object locker = new object();
/// <summary>Initializes a new instance of the RazorGeneral class.</summary> /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) { internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
{
this.rule = rule; this.rule = rule;
} }
/// <summary>Initializes a new instance of the RazorGeneral class.</summary> /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) :
this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) { this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
if ((configuredProject == null)) { {
if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -75,11 +80,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorGeneral class.</summary> /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) :
this(rule) { this(rule)
if ((rule == null)) { {
if ((rule == null))
{
throw new System.ArgumentNullException("rule"); throw new System.ArgumentNullException("rule");
} }
if ((configuredProject == null)) { if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -91,34 +99,43 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorGeneral class.</summary> /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) :
this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) { this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
{
} }
/// <summary>Initializes a new instance of the RazorGeneral class that assumes a project context (neither property sheet nor items).</summary> /// <summary>Initializes a new instance of the RazorGeneral class that assumes a project context (neither property sheet nor items).</summary>
internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) :
this(configuredProject, catalogs, "Project", null, null, null) { this(configuredProject, catalogs, "Project", null, null, null)
{
} }
/// <summary>Gets the IRule used to get and set properties.</summary> /// <summary>Gets the IRule used to get and set properties.</summary>
public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule { public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
get { {
get
{
return this.rule; return this.rule;
} }
} }
/// <summary>Razor Language Version</summary> /// <summary>Razor Language Version</summary>
internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorLangVersion { internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorLangVersion
get { {
get
{
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
if ((localRule == null)) { if ((localRule == null))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
} }
if ((localRule == null)) { if ((localRule == null))
{
return null; return null;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty))); Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
if (((property == null) if (((property == null)
&& (this.GeneratedFallbackRule != null))) { && (this.GeneratedFallbackRule != null)))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty))); property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
} }
@ -127,18 +144,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
/// <summary>Razor Configuration Name</summary> /// <summary>Razor Configuration Name</summary>
internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorDefaultConfiguration { internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorDefaultConfiguration
get { {
get
{
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
if ((localRule == null)) { if ((localRule == null))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
} }
if ((localRule == null)) { if ((localRule == null))
{
return null; return null;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty))); Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
if (((property == null) if (((property == null)
&& (this.GeneratedFallbackRule != null))) { && (this.GeneratedFallbackRule != null)))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty))); property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
} }
@ -147,17 +169,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary> /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule { private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
get { {
get
{
if (((this.fallbackRule == null) if (((this.fallbackRule == null)
&& (this.configuredProject != null))) { && (this.configuredProject != null)))
{
System.Threading.Monitor.Enter(this.locker); System.Threading.Monitor.Enter(this.locker);
try { try
if ((this.fallbackRule == null)) { {
if ((this.fallbackRule == null))
{
this.InitializeFallbackRule(); this.InitializeFallbackRule();
} }
} }
finally { finally
{
System.Threading.Monitor.Exit(this.locker); System.Threading.Monitor.Exit(this.locker);
} }
} }
@ -165,48 +193,61 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) { private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
if ((catalog == null)) { {
if ((catalog == null))
{
return null; return null;
} }
return catalog.BindToContext(SchemaName, file, itemType, itemName); return catalog.BindToContext(SchemaName, file, itemType, itemName);
} }
private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) { private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
if ((propertiesContext.IsProjectFile == true)) { {
if ((propertiesContext.IsProjectFile == true))
{
return null; return null;
} }
else { else
{
return propertiesContext.File; return propertiesContext.File;
} }
} }
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
if ((this.configuredProject == null))
{
return; return;
} }
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule;
if ((unboundRule == null)) { if ((unboundRule == null))
{
System.IO.Stream xamlStream = null; System.IO.Stream xamlStream = null;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
try { try
{
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml"); xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml");
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
for ( for (
; ((unboundRule == null) ; ((unboundRule == null)
&& ruleEnumerator.MoveNext()); && ruleEnumerator.MoveNext());
) { )
{
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
{
unboundRule = t; unboundRule = t;
unboundRule.Name = "e0400917-b7e9-4731-b3e6-447b229db9d4"; unboundRule.Name = "6851f2efc446915a1288ec829aa82f7dc9bcfc6addb65b97866a1bc9e30b3348";
RazorGeneral.deserializedFallbackRule = unboundRule; RazorGeneral.deserializedFallbackRule = unboundRule;
} }
} }
} }
finally { finally
if ((xamlStream != null)) { {
if ((xamlStream != null))
{
((System.IDisposable)(xamlStream)).Dispose(); ((System.IDisposable)(xamlStream)).Dispose();
} }
} }
@ -217,19 +258,46 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
internal partial class RazorProjectProperties { internal partial class RazorProjectProperties
{
private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral> CreateRazorGeneralPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral>(CreateRazorGeneralProperties); private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral> CreateRazorGeneralPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral>(CreateRazorGeneralProperties);
private static RazorGeneral CreateRazorGeneralProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) { private static RazorGeneral CreateRazorGeneralProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
{
RazorProjectProperties that = ((RazorProjectProperties)(state)); RazorProjectProperties that = ((RazorProjectProperties)(state));
return new RazorGeneral(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); return new RazorGeneral(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
} }
/// <summary>Gets the strongly-typed property accessor used to get and set Razor Properties properties.</summary> /// <summary>Gets the strongly-typed property accessor used to get and set Razor Properties properties.</summary>
internal System.Threading.Tasks.Task<RazorGeneral> GetRazorGeneralPropertiesAsync() { internal System.Threading.Tasks.Task<RazorGeneral> GetRazorGeneralPropertiesAsync()
{
System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync(); System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
return namedCatalogsTask.ContinueWith(CreateRazorGeneralPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); return namedCatalogsTask.ContinueWith(CreateRazorGeneralPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
} }
/// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Razor Properties properties.</summary>
internal bool TryGetCurrentRazorGeneralPropertiesSnapshot(out RazorGeneral snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
{
snapshot = null;
Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
{
if (requiredToMatchProjectVersion)
{
if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
{
return false;
}
}
Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorGeneral.SchemaName);
if ((rule != null))
{
snapshot = new RazorGeneral(rule, this.ConfiguredProject);
return true;
}
}
return false;
}
} }
} }

View File

@ -8,10 +8,12 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules { namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
{
internal partial class RazorGenerateWithTargetPath { internal partial class RazorGenerateWithTargetPath
{
/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary> /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule; private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
@ -25,7 +27,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>The Label given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary> /// <summary>The Label given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary>
internal const string PrimaryDataSourceLabel = ""; internal const string PrimaryDataSourceLabel = "";
/// <summary>Target Path (The "TargetPath" property).</summary> /// <summary> (The "TargetPath" property).</summary>
internal const string TargetPathProperty = "TargetPath"; internal const string TargetPathProperty = "TargetPath";
/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary> /// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
@ -53,14 +55,17 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
private object locker = new object(); private object locker = new object();
/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary> /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) { internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
{
this.rule = rule; this.rule = rule;
} }
/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary> /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) :
this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) { this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
if ((configuredProject == null)) { {
if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -72,11 +77,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary> /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) :
this(rule) { this(rule)
if ((rule == null)) { {
if ((rule == null))
{
throw new System.ArgumentNullException("rule"); throw new System.ArgumentNullException("rule");
} }
if ((configuredProject == null)) { if ((configuredProject == null))
{
throw new System.ArgumentNullException("configuredProject"); throw new System.ArgumentNullException("configuredProject");
} }
this.configuredProject = configuredProject; this.configuredProject = configuredProject;
@ -88,34 +96,43 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary> /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) :
this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) { this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
{
} }
/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class that assumes a project context (neither property sheet nor items).</summary> /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class that assumes a project context (neither property sheet nor items).</summary>
internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) :
this(configuredProject, catalogs, "Project", null, null, null) { this(configuredProject, catalogs, "Project", null, null, null)
{
} }
/// <summary>Gets the IRule used to get and set properties.</summary> /// <summary>Gets the IRule used to get and set properties.</summary>
public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule { public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
get { {
get
{
return this.rule; return this.rule;
} }
} }
/// <summary>Target Path</summary> /// <summary>TargetPath</summary>
internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty TargetPath { internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty TargetPath
get { {
get
{
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
if ((localRule == null)) { if ((localRule == null))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
} }
if ((localRule == null)) { if ((localRule == null))
{
return null; return null;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty))); Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
if (((property == null) if (((property == null)
&& (this.GeneratedFallbackRule != null))) { && (this.GeneratedFallbackRule != null)))
{
localRule = this.GeneratedFallbackRule; localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty))); property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
} }
@ -124,17 +141,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary> /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule { private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
get { {
get
{
if (((this.fallbackRule == null) if (((this.fallbackRule == null)
&& (this.configuredProject != null))) { && (this.configuredProject != null)))
{
System.Threading.Monitor.Enter(this.locker); System.Threading.Monitor.Enter(this.locker);
try { try
if ((this.fallbackRule == null)) { {
if ((this.fallbackRule == null))
{
this.InitializeFallbackRule(); this.InitializeFallbackRule();
} }
} }
finally { finally
{
System.Threading.Monitor.Exit(this.locker); System.Threading.Monitor.Exit(this.locker);
} }
} }
@ -142,48 +165,61 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) { private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
if ((catalog == null)) { {
if ((catalog == null))
{
return null; return null;
} }
return catalog.BindToContext(SchemaName, file, itemType, itemName); return catalog.BindToContext(SchemaName, file, itemType, itemName);
} }
private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) { private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
if ((propertiesContext.IsProjectFile == true)) { {
if ((propertiesContext.IsProjectFile == true))
{
return null; return null;
} }
else { else
{
return propertiesContext.File; return propertiesContext.File;
} }
} }
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
if ((this.configuredProject == null))
{
return; return;
} }
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule;
if ((unboundRule == null)) { if ((unboundRule == null))
{
System.IO.Stream xamlStream = null; System.IO.Stream xamlStream = null;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
try { try
{
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml"); xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml");
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
for ( for (
; ((unboundRule == null) ; ((unboundRule == null)
&& ruleEnumerator.MoveNext()); && ruleEnumerator.MoveNext());
) { )
{
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
{
unboundRule = t; unboundRule = t;
unboundRule.Name = "4d01f23e-96db-4c90-9c01-17b7f8b61243"; unboundRule.Name = "4325a10cce970a389c33b97140c4307d2e10664e053c75cf9e0e0fd08288774f";
RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule; RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule;
} }
} }
} }
finally { finally
if ((xamlStream != null)) { {
if ((xamlStream != null))
{
((System.IDisposable)(xamlStream)).Dispose(); ((System.IDisposable)(xamlStream)).Dispose();
} }
} }
@ -194,19 +230,46 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
} }
} }
internal partial class RazorProjectProperties { internal partial class RazorProjectProperties
{
private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath> CreateRazorGenerateWithTargetPathPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath>(CreateRazorGenerateWithTargetPathProperties); private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath> CreateRazorGenerateWithTargetPathPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath>(CreateRazorGenerateWithTargetPathProperties);
private static RazorGenerateWithTargetPath CreateRazorGenerateWithTargetPathProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) { private static RazorGenerateWithTargetPath CreateRazorGenerateWithTargetPathProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
{
RazorProjectProperties that = ((RazorProjectProperties)(state)); RazorProjectProperties that = ((RazorProjectProperties)(state));
return new RazorGenerateWithTargetPath(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); return new RazorGenerateWithTargetPath(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
} }
/// <summary>Gets the strongly-typed property accessor used to get and set Razor Document Properties properties.</summary> /// <summary>Gets the strongly-typed property accessor used to get and set Razor Document Properties properties.</summary>
internal System.Threading.Tasks.Task<RazorGenerateWithTargetPath> GetRazorGenerateWithTargetPathPropertiesAsync() { internal System.Threading.Tasks.Task<RazorGenerateWithTargetPath> GetRazorGenerateWithTargetPathPropertiesAsync()
{
System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync(); System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
return namedCatalogsTask.ContinueWith(CreateRazorGenerateWithTargetPathPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); return namedCatalogsTask.ContinueWith(CreateRazorGenerateWithTargetPathPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
} }
/// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Razor Document Properties properties.</summary>
internal bool TryGetCurrentRazorGenerateWithTargetPathPropertiesSnapshot(out RazorGenerateWithTargetPath snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
{
snapshot = null;
Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
{
if (requiredToMatchProjectVersion)
{
if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
{
return false;
}
}
Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorGenerateWithTargetPath.SchemaName);
if ((rule != null))
{
snapshot = new RazorGenerateWithTargetPath(rule, this.ConfiguredProject);
return true;
}
}
return false;
}
} }
} }

View File

@ -29,7 +29,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
public TestProjectSystemServices(string fullPath, params TestPropertyData[] data) public TestProjectSystemServices(string fullPath, params TestPropertyData[] data)
{ {
ProjectService = new TestProjectService(); ProjectService = new TestProjectService();
ThreadingService = ProjectService.Services.ThreadingPolicy; ThreadingService = ProjectService.Services.TestThreadingPolicy;
UnconfiguredProject = new TestUnconfiguredProject(ProjectService, fullPath); UnconfiguredProject = new TestUnconfiguredProject(ProjectService, fullPath);
ProjectService.LoadedUnconfiguredProjects.Add(UnconfiguredProject); ProjectService.LoadedUnconfiguredProjects.Add(UnconfiguredProject);
@ -87,33 +87,33 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
dataSourceVersions: ImmutableDictionary<NamedIdentity, IComparable>.Empty); dataSourceVersions: ImmutableDictionary<NamedIdentity, IComparable>.Empty);
} }
public class TestProjectServices : IProjectServices public class TestProjectServices : ProjectServices
{ {
public TestProjectServices(TestProjectService projectService) public TestProjectServices(TestProjectService projectService)
{ {
ProjectService = projectService; TestProjectService = projectService;
ThreadingPolicy = new TestThreadingService(); TestThreadingPolicy = new TestThreadingService();
} }
public TestProjectService ProjectService { get; } public TestProjectService TestProjectService { get; }
public TestThreadingService ThreadingPolicy { get; } public TestThreadingService TestThreadingPolicy { get; }
IProjectLockService IProjectServices.ProjectLockService => throw new NotImplementedException(); public override IProjectService ProjectService => TestProjectService;
IProjectThreadingService IProjectServices.ThreadingPolicy => ThreadingPolicy; public override IProjectThreadingService ThreadingPolicy => TestThreadingPolicy;
IProjectFaultHandlerService IProjectServices.FaultHandler => throw new NotImplementedException(); public override ExportProvider ExportProvider => throw new NotImplementedException();
IProjectReloader IProjectServices.ProjectReloader => throw new NotImplementedException(); public override IProjectDataSourceRegistry DataSourceRegistry => throw new NotImplementedException();
ExportProvider IProjectCommonServices.ExportProvider => throw new NotImplementedException(); public override IProjectCapabilitiesScope Capabilities => throw new NotImplementedException();
IProjectDataSourceRegistry IProjectCommonServices.DataSourceRegistry => throw new NotImplementedException(); public override IProjectLockService ProjectLockService => throw new NotImplementedException();
IProjectService IProjectCommonServices.ProjectService => ProjectService; public override IProjectFaultHandlerService FaultHandler => throw new NotImplementedException();
IProjectCapabilitiesScope IProjectCommonServices.Capabilities => throw new NotImplementedException(); public override IProjectReloader ProjectReloader => throw new NotImplementedException();
} }
public class TestProjectService : IProjectService public class TestProjectService : IProjectService
@ -130,7 +130,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
IEnumerable<UnconfiguredProject> IProjectService.LoadedUnconfiguredProjects => throw new NotImplementedException(); IEnumerable<UnconfiguredProject> IProjectService.LoadedUnconfiguredProjects => throw new NotImplementedException();
IProjectServices IProjectService.Services => Services; ProjectServices IProjectService.Services => Services;
IProjectCapabilitiesScope IProjectService.Capabilities => throw new NotImplementedException(); IProjectCapabilitiesScope IProjectService.Capabilities => throw new NotImplementedException();
@ -171,15 +171,16 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
public List<TestConfiguredProject> LoadedConfiguredProjects { get; } public List<TestConfiguredProject> LoadedConfiguredProjects { get; }
public UnconfiguredProjectServices Services => throw new NotImplementedException();
string UnconfiguredProject.FullPath => FullPath; string UnconfiguredProject.FullPath => FullPath;
bool UnconfiguredProject.RequiresReloadForExternalFileChange => throw new NotImplementedException(); bool UnconfiguredProject.RequiresReloadForExternalFileChange => throw new NotImplementedException();
IProjectCapabilitiesScope UnconfiguredProject.Capabilities => throw new NotImplementedException(); IProjectCapabilitiesScope UnconfiguredProject.Capabilities => throw new NotImplementedException();
IProjectService UnconfiguredProject.ProjectService => ProjectService; IProjectService UnconfiguredProject.ProjectService => ProjectService;
IUnconfiguredProjectServices UnconfiguredProject.Services => throw new NotImplementedException();
IEnumerable<ConfiguredProject> UnconfiguredProject.LoadedConfiguredProjects => LoadedConfiguredProjects; IEnumerable<ConfiguredProject> UnconfiguredProject.LoadedConfiguredProjects => LoadedConfiguredProjects;
bool UnconfiguredProject.IsLoading => throw new NotImplementedException(); bool UnconfiguredProject.IsLoading => throw new NotImplementedException();
@ -323,7 +324,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
UnconfiguredProject ConfiguredProject.UnconfiguredProject => UnconfiguredProject; UnconfiguredProject ConfiguredProject.UnconfiguredProject => UnconfiguredProject;
IConfiguredProjectServices ConfiguredProject.Services => Services; ConfiguredProjectServices ConfiguredProject.Services => Services;
event AsyncEventHandler ConfiguredProject.ProjectUnloading event AsyncEventHandler ConfiguredProject.ProjectUnloading
{ {
@ -370,65 +371,81 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
} }
} }
public class TestConfiguredProjectServices : IConfiguredProjectServices public class TestConfiguredProjectServices : ConfiguredProjectServices
{ {
public TestConfiguredProjectServices(TestConfiguredProject configuredProject, TestPropertyData[] data) public TestConfiguredProjectServices(TestConfiguredProject configuredProject, TestPropertyData[] data)
{ {
ConfiguredProject = configuredProject; ConfiguredProject = configuredProject;
AdditionalRuleDefinitions = new TestAdditionalRuleDefinitionsService(); TestAdditionalRuleDefinitions = new TestAdditionalRuleDefinitionsService();
PropertyPagesCatalog = new TestPropertyPagesCatalogProvider(new TestPropertyPagesCatalog(data)); TestPropertyPagesCatalog = new TestPropertyPagesCatalogProvider(new TestPropertyPagesCatalog(data));
} }
public TestConfiguredProject ConfiguredProject { get; } public TestConfiguredProject ConfiguredProject { get; }
public TestAdditionalRuleDefinitionsService AdditionalRuleDefinitions { get; } public TestAdditionalRuleDefinitionsService TestAdditionalRuleDefinitions { get; }
public TestPropertyPagesCatalogProvider PropertyPagesCatalog { get; } public override IAdditionalRuleDefinitionsService AdditionalRuleDefinitions => TestAdditionalRuleDefinitions;
IOutputGroupsService IConfiguredProjectServices.OutputGroups => throw new NotImplementedException(); public TestPropertyPagesCatalogProvider TestPropertyPagesCatalog { get; }
IBuildProject IConfiguredProjectServices.Build => throw new NotImplementedException(); public override IPropertyPagesCatalogProvider PropertyPagesCatalog => TestPropertyPagesCatalog;
IBuildSupport IConfiguredProjectServices.BuildSupport => throw new NotImplementedException(); public override IOutputGroupsService OutputGroups => throw new NotImplementedException();
IAssemblyReferencesService IConfiguredProjectServices.AssemblyReferences => throw new NotImplementedException(); public override IBuildProject Build => throw new NotImplementedException();
IComReferencesService IConfiguredProjectServices.ComReferences => throw new NotImplementedException(); public override IBuildSupport BuildSupport => throw new NotImplementedException();
ISdkReferencesService IConfiguredProjectServices.SdkReferences => throw new NotImplementedException(); public override IAssemblyReferencesService AssemblyReferences => throw new NotImplementedException();
IPackageReferencesService IConfiguredProjectServices.PackageReferences => throw new NotImplementedException(); public override IComReferencesService ComReferences => throw new NotImplementedException();
IWinRTReferencesService IConfiguredProjectServices.WinRTReferences => throw new NotImplementedException(); public override ISdkReferencesService SdkReferences => throw new NotImplementedException();
IBuildDependencyProjectReferencesService IConfiguredProjectServices.ProjectReferences => throw new NotImplementedException(); public override IPackageReferencesService PackageReferences => throw new NotImplementedException();
IProjectItemProvider IConfiguredProjectServices.SourceItems => throw new NotImplementedException(); public override IWinRTReferencesService WinRTReferences => throw new NotImplementedException();
IProjectPropertiesProvider IConfiguredProjectServices.ProjectPropertiesProvider => throw new NotImplementedException(); public override IBuildDependencyProjectReferencesService ProjectReferences => throw new NotImplementedException();
IProjectPropertiesProvider IConfiguredProjectServices.UserPropertiesProvider => throw new NotImplementedException(); public override IProjectItemProvider SourceItems => throw new NotImplementedException();
IProjectAsynchronousTasksService IConfiguredProjectServices.ProjectAsynchronousTasks => throw new NotImplementedException(); public override IProjectPropertiesProvider ProjectPropertiesProvider => throw new NotImplementedException();
IAdditionalRuleDefinitionsService IConfiguredProjectServices.AdditionalRuleDefinitions => AdditionalRuleDefinitions; public override IProjectPropertiesProvider UserPropertiesProvider => throw new NotImplementedException();
IPropertyPagesCatalogProvider IConfiguredProjectServices.PropertyPagesCatalog => PropertyPagesCatalog; public override IProjectSubscriptionService ProjectSubscription => throw new NotImplementedException();
IProjectSubscriptionService IConfiguredProjectServices.ProjectSubscription => throw new NotImplementedException(); public override IProjectSnapshotService ProjectSnapshotService => throw new NotImplementedException();
IProjectSnapshotService IConfiguredProjectServices.ProjectSnapshotService => throw new NotImplementedException(); public override IActiveConfiguredProjectSubscriptionService ActiveConfiguredProjectSubscription => throw new NotImplementedException();
object IConfiguredProjectServices.HostObject => throw new NotImplementedException(); public override IActiveConfiguredProjectProvider ActiveConfiguredProjectProvider => throw new NotImplementedException();
ExportProvider IProjectCommonServices.ExportProvider => throw new NotImplementedException(); public override IProjectAsynchronousTasksService ProjectAsynchronousTasks => throw new NotImplementedException();
IProjectDataSourceRegistry IProjectCommonServices.DataSourceRegistry => throw new NotImplementedException(); public override IProjectConfigurationsService ProjectConfigurationsService => throw new NotImplementedException();
IProjectService IProjectCommonServices.ProjectService => ConfiguredProject.UnconfiguredProject.ProjectService; public override object HostObject => throw new NotImplementedException();
IProjectCapabilitiesScope IProjectCommonServices.Capabilities => throw new NotImplementedException(); public override IProjectCapabilitiesRequirementsService ProjectCapabilitiesRequirementsService => throw new NotImplementedException();
public override ExportProvider ExportProvider => throw new NotImplementedException();
public override IProjectDataSourceRegistry DataSourceRegistry => throw new NotImplementedException();
public override IProjectService ProjectService => ConfiguredProject.UnconfiguredProject.ProjectService;
public override IProjectCapabilitiesScope Capabilities => throw new NotImplementedException();
public override IProjectLockService ProjectLockService => throw new NotImplementedException();
public override IProjectThreadingService ThreadingPolicy => throw new NotImplementedException();
public override IProjectFaultHandlerService FaultHandler => throw new NotImplementedException();
public override IProjectReloader ProjectReloader => throw new NotImplementedException();
} }
public class TestAdditionalRuleDefinitionsService : IAdditionalRuleDefinitionsService public class TestAdditionalRuleDefinitionsService : IAdditionalRuleDefinitionsService