huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
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>

3
build/sources.props
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);

2
src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
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)" />

405
src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs
View File

@ -8,205 +8,268 @@
// </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;
/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary> /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
internal const string SchemaName = "RazorConfiguration"; internal const string SchemaName = "RazorConfiguration";
/// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary> /// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary>
internal const string PrimaryDataSourceItemType = "RazorConfiguration"; internal const string PrimaryDataSourceItemType = "RazorConfiguration";
/// <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>Razor Extensions (The "Extensions" property).</summary> /// <summary>Razor Extensions (The "Extensions" property).</summary>
internal const string ExtensionsProperty = "Extensions"; internal const string ExtensionsProperty = "Extensions";
/// <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>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
/// <summary>Backing field for the file name of the rule property.</summary> /// <summary>Backing field for the file name of the rule property.</summary>
private string file; private string file;
/// <summary>Backing field for the ItemType property.</summary> /// <summary>Backing field for the ItemType property.</summary>
private string itemType; private string itemType;
/// <summary>Backing field for the ItemName property.</summary> /// <summary>Backing field for the ItemName property.</summary>
private string itemName; private string itemName;
/// <summary>Configured Project</summary> /// <summary>Configured Project</summary>
private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject; private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
/// <summary>The dictionary of named catalogs.</summary> /// <summary>The dictionary of named catalogs.</summary>
private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs; private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary> /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
/// <summary>Thread locking object</summary> /// <summary>Thread locking object</summary>
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)) { {
throw new System.ArgumentNullException("configuredProject"); if ((configuredProject == null))
} {
this.configuredProject = configuredProject; throw new System.ArgumentNullException("configuredProject");
this.catalogs = catalogs; }
this.file = file; this.configuredProject = configuredProject;
this.itemType = itemType; this.catalogs = catalogs;
this.itemName = itemName; this.file = file;
} this.itemType = itemType;
this.itemName = itemName;
}
/// <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)) { {
throw new System.ArgumentNullException("rule"); if ((rule == null))
} {
if ((configuredProject == null)) { throw new System.ArgumentNullException("rule");
throw new System.ArgumentNullException("configuredProject"); }
} if ((configuredProject == null))
this.configuredProject = configuredProject; {
this.rule = rule; throw new System.ArgumentNullException("configuredProject");
this.file = this.rule.File; }
this.itemType = this.rule.ItemType; this.configuredProject = configuredProject;
this.itemName = this.rule.ItemName; this.rule = rule;
} this.file = this.rule.File;
this.itemType = this.rule.ItemType;
this.itemName = this.rule.ItemName;
}
/// <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 { {
return this.rule; get
} {
} 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 { {
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; get
if ((localRule == null)) { {
localRule = this.GeneratedFallbackRule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
} if ((localRule == null))
if ((localRule == null)) { {
return null; localRule = this.GeneratedFallbackRule;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty))); if ((localRule == null))
if (((property == null) {
&& (this.GeneratedFallbackRule != null))) { return null;
localRule = this.GeneratedFallbackRule; }
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)
return property; && (this.GeneratedFallbackRule != null)))
} {
} localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
}
return property;
}
}
/// <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 { {
if (((this.fallbackRule == null) get
&& (this.configuredProject != null))) { {
System.Threading.Monitor.Enter(this.locker); if (((this.fallbackRule == null)
try { && (this.configuredProject != null)))
if ((this.fallbackRule == null)) { {
this.InitializeFallbackRule(); System.Threading.Monitor.Enter(this.locker);
} try
} {
finally { if ((this.fallbackRule == null))
System.Threading.Monitor.Exit(this.locker); {
} this.InitializeFallbackRule();
} }
return this.fallbackRule; }
} finally
} {
System.Threading.Monitor.Exit(this.locker);
}
}
return this.fallbackRule;
}
}
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)) { {
return null; if ((catalog == null))
} {
return catalog.BindToContext(SchemaName, file, itemType, itemName); return null;
} }
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)) { {
return null; if ((propertiesContext.IsProjectFile == true))
} {
else { return null;
return propertiesContext.File; }
} else
} {
return propertiesContext.File;
}
}
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
return; if ((this.configuredProject == null))
} {
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule; return;
if ((unboundRule == null)) { }
System.IO.Stream xamlStream = null; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); if ((unboundRule == null))
try { {
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml"); System.IO.Stream xamlStream = null;
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); try
for ( {
; ((unboundRule == null) xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml");
&& ruleEnumerator.MoveNext()); 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();
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); for (
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { ; ((unboundRule == null)
unboundRule = t; && ruleEnumerator.MoveNext());
unboundRule.Name = "30e71838-2cb8-4c67-ab28-7670763124af"; )
RazorConfiguration.deserializedFallbackRule = unboundRule; {
} Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
} if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
} {
finally { unboundRule = t;
if ((xamlStream != null)) { unboundRule.Name = "f269edfbdecc0079d5f539c22552711e194f39b2367903515ae5440a64b20a0f";
((System.IDisposable)(xamlStream)).Dispose(); RazorConfiguration.deserializedFallbackRule = unboundRule;
} }
} }
} }
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext"); finally
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext"); {
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName); if ((xamlStream != null))
} {
} ((System.IDisposable)(xamlStream)).Dispose();
}
}
}
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
}
}
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)); {
return new RazorConfiguration(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); RazorProjectProperties that = ((RazorProjectProperties)(state));
} 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(); {
return namedCatalogsTask.ContinueWith(CreateRazorConfigurationPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); 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);
} }
/// <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;
}
}
} }

452
src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs
View File

@ -8,228 +8,296 @@
// </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;
/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary> /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
internal const string SchemaName = "RazorExtension"; internal const string SchemaName = "RazorExtension";
/// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary> /// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary>
internal const string PrimaryDataSourceItemType = "RazorExtension"; internal const string PrimaryDataSourceItemType = "RazorExtension";
/// <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>Razor Extension Assembly Name (The "AssemblyName" property).</summary> /// <summary>Razor Extension Assembly Name (The "AssemblyName" property).</summary>
internal const string AssemblyNameProperty = "AssemblyName"; internal const string AssemblyNameProperty = "AssemblyName";
/// <summary>Razor Extension Assembly File Path (The "AssemblyFilePath" property).</summary> /// <summary>Razor Extension Assembly File Path (The "AssemblyFilePath" property).</summary>
internal const string AssemblyFilePathProperty = "AssemblyFilePath"; internal const string AssemblyFilePathProperty = "AssemblyFilePath";
/// <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>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
/// <summary>Backing field for the file name of the rule property.</summary> /// <summary>Backing field for the file name of the rule property.</summary>
private string file; private string file;
/// <summary>Backing field for the ItemType property.</summary> /// <summary>Backing field for the ItemType property.</summary>
private string itemType; private string itemType;
/// <summary>Backing field for the ItemName property.</summary> /// <summary>Backing field for the ItemName property.</summary>
private string itemName; private string itemName;
/// <summary>Configured Project</summary> /// <summary>Configured Project</summary>
private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject; private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
/// <summary>The dictionary of named catalogs.</summary> /// <summary>The dictionary of named catalogs.</summary>
private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs; private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary> /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
/// <summary>Thread locking object</summary> /// <summary>Thread locking object</summary>
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)) { {
throw new System.ArgumentNullException("configuredProject"); if ((configuredProject == null))
} {
this.configuredProject = configuredProject; throw new System.ArgumentNullException("configuredProject");
this.catalogs = catalogs; }
this.file = file; this.configuredProject = configuredProject;
this.itemType = itemType; this.catalogs = catalogs;
this.itemName = itemName; this.file = file;
} this.itemType = itemType;
this.itemName = itemName;
}
/// <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)) { {
throw new System.ArgumentNullException("rule"); if ((rule == null))
} {
if ((configuredProject == null)) { throw new System.ArgumentNullException("rule");
throw new System.ArgumentNullException("configuredProject"); }
} if ((configuredProject == null))
this.configuredProject = configuredProject; {
this.rule = rule; throw new System.ArgumentNullException("configuredProject");
this.file = this.rule.File; }
this.itemType = this.rule.ItemType; this.configuredProject = configuredProject;
this.itemName = this.rule.ItemName; this.rule = rule;
} this.file = this.rule.File;
this.itemType = this.rule.ItemType;
this.itemName = this.rule.ItemName;
}
/// <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 { {
return this.rule; get
} {
} 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 { {
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; get
if ((localRule == null)) { {
localRule = this.GeneratedFallbackRule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
} if ((localRule == null))
if ((localRule == null)) { {
return null; localRule = this.GeneratedFallbackRule;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty))); if ((localRule == null))
if (((property == null) {
&& (this.GeneratedFallbackRule != null))) { return null;
localRule = this.GeneratedFallbackRule; }
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)
return property; && (this.GeneratedFallbackRule != null)))
} {
} localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
}
return property;
}
}
/// <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 { {
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; get
if ((localRule == null)) { {
localRule = this.GeneratedFallbackRule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
} if ((localRule == null))
if ((localRule == null)) { {
return null; localRule = this.GeneratedFallbackRule;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty))); if ((localRule == null))
if (((property == null) {
&& (this.GeneratedFallbackRule != null))) { return null;
localRule = this.GeneratedFallbackRule; }
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)
return property; && (this.GeneratedFallbackRule != null)))
} {
} localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
}
return property;
}
}
/// <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 { {
if (((this.fallbackRule == null) get
&& (this.configuredProject != null))) { {
System.Threading.Monitor.Enter(this.locker); if (((this.fallbackRule == null)
try { && (this.configuredProject != null)))
if ((this.fallbackRule == null)) { {
this.InitializeFallbackRule(); System.Threading.Monitor.Enter(this.locker);
} try
} {
finally { if ((this.fallbackRule == null))
System.Threading.Monitor.Exit(this.locker); {
} this.InitializeFallbackRule();
} }
return this.fallbackRule; }
} finally
} {
System.Threading.Monitor.Exit(this.locker);
}
}
return this.fallbackRule;
}
}
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)) { {
return null; if ((catalog == null))
} {
return catalog.BindToContext(SchemaName, file, itemType, itemName); return null;
} }
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)) { {
return null; if ((propertiesContext.IsProjectFile == true))
} {
else { return null;
return propertiesContext.File; }
} else
} {
return propertiesContext.File;
}
}
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
return; if ((this.configuredProject == null))
} {
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule; return;
if ((unboundRule == null)) { }
System.IO.Stream xamlStream = null; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); if ((unboundRule == null))
try { {
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml"); System.IO.Stream xamlStream = null;
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); try
for ( {
; ((unboundRule == null) xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml");
&& ruleEnumerator.MoveNext()); 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();
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); for (
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { ; ((unboundRule == null)
unboundRule = t; && ruleEnumerator.MoveNext());
unboundRule.Name = "6b577687-703b-41a1-8f5f-c44644f65f2a"; )
RazorExtension.deserializedFallbackRule = unboundRule; {
} Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
} if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
} {
finally { unboundRule = t;
if ((xamlStream != null)) { unboundRule.Name = "e8ad5dd707beca947f7c014baa70b46c1d7a7fd6c8b49a5511ab299d8e1a3c70";
((System.IDisposable)(xamlStream)).Dispose(); RazorExtension.deserializedFallbackRule = unboundRule;
} }
} }
} }
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext"); finally
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext"); {
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName); if ((xamlStream != null))
} {
} ((System.IDisposable)(xamlStream)).Dispose();
}
}
}
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
}
}
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)); {
return new RazorExtension(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); RazorProjectProperties that = ((RazorProjectProperties)(state));
} 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(); {
return namedCatalogsTask.ContinueWith(CreateRazorExtensionPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); 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);
} }
/// <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;
}
}
} }

452
src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs
View File

@ -8,228 +8,296 @@
// </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;
/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary> /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
internal const string SchemaName = "RazorGeneral"; internal const string SchemaName = "RazorGeneral";
/// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary> /// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary>
internal const string PrimaryDataSourceItemType = null; internal const string PrimaryDataSourceItemType = null;
/// <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>Razor Language Version (The "RazorLangVersion" property).</summary> /// <summary>Razor Language Version (The "RazorLangVersion" property).</summary>
internal const string RazorLangVersionProperty = "RazorLangVersion"; internal const string RazorLangVersionProperty = "RazorLangVersion";
/// <summary>Razor Configuration Name (The "RazorDefaultConfiguration" property).</summary> /// <summary>Razor Configuration Name (The "RazorDefaultConfiguration" property).</summary>
internal const string RazorDefaultConfigurationProperty = "RazorDefaultConfiguration"; internal const string RazorDefaultConfigurationProperty = "RazorDefaultConfiguration";
/// <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>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
/// <summary>Backing field for the file name of the rule property.</summary> /// <summary>Backing field for the file name of the rule property.</summary>
private string file; private string file;
/// <summary>Backing field for the ItemType property.</summary> /// <summary>Backing field for the ItemType property.</summary>
private string itemType; private string itemType;
/// <summary>Backing field for the ItemName property.</summary> /// <summary>Backing field for the ItemName property.</summary>
private string itemName; private string itemName;
/// <summary>Configured Project</summary> /// <summary>Configured Project</summary>
private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject; private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
/// <summary>The dictionary of named catalogs.</summary> /// <summary>The dictionary of named catalogs.</summary>
private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs; private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary> /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
/// <summary>Thread locking object</summary> /// <summary>Thread locking object</summary>
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)) { {
throw new System.ArgumentNullException("configuredProject"); if ((configuredProject == null))
} {
this.configuredProject = configuredProject; throw new System.ArgumentNullException("configuredProject");
this.catalogs = catalogs; }
this.file = file; this.configuredProject = configuredProject;
this.itemType = itemType; this.catalogs = catalogs;
this.itemName = itemName; this.file = file;
} this.itemType = itemType;
this.itemName = itemName;
}
/// <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)) { {
throw new System.ArgumentNullException("rule"); if ((rule == null))
} {
if ((configuredProject == null)) { throw new System.ArgumentNullException("rule");
throw new System.ArgumentNullException("configuredProject"); }
} if ((configuredProject == null))
this.configuredProject = configuredProject; {
this.rule = rule; throw new System.ArgumentNullException("configuredProject");
this.file = this.rule.File; }
this.itemType = this.rule.ItemType; this.configuredProject = configuredProject;
this.itemName = this.rule.ItemName; this.rule = rule;
} this.file = this.rule.File;
this.itemType = this.rule.ItemType;
this.itemName = this.rule.ItemName;
}
/// <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 { {
return this.rule; get
} {
} 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 { {
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; get
if ((localRule == null)) { {
localRule = this.GeneratedFallbackRule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
} if ((localRule == null))
if ((localRule == null)) { {
return null; localRule = this.GeneratedFallbackRule;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty))); if ((localRule == null))
if (((property == null) {
&& (this.GeneratedFallbackRule != null))) { return null;
localRule = this.GeneratedFallbackRule; }
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)
return property; && (this.GeneratedFallbackRule != null)))
} {
} localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
}
return property;
}
}
/// <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 { {
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; get
if ((localRule == null)) { {
localRule = this.GeneratedFallbackRule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
} if ((localRule == null))
if ((localRule == null)) { {
return null; localRule = this.GeneratedFallbackRule;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty))); if ((localRule == null))
if (((property == null) {
&& (this.GeneratedFallbackRule != null))) { return null;
localRule = this.GeneratedFallbackRule; }
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)
return property; && (this.GeneratedFallbackRule != null)))
} {
} localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
}
return property;
}
}
/// <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 { {
if (((this.fallbackRule == null) get
&& (this.configuredProject != null))) { {
System.Threading.Monitor.Enter(this.locker); if (((this.fallbackRule == null)
try { && (this.configuredProject != null)))
if ((this.fallbackRule == null)) { {
this.InitializeFallbackRule(); System.Threading.Monitor.Enter(this.locker);
} try
} {
finally { if ((this.fallbackRule == null))
System.Threading.Monitor.Exit(this.locker); {
} this.InitializeFallbackRule();
} }
return this.fallbackRule; }
} finally
} {
System.Threading.Monitor.Exit(this.locker);
}
}
return this.fallbackRule;
}
}
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)) { {
return null; if ((catalog == null))
} {
return catalog.BindToContext(SchemaName, file, itemType, itemName); return null;
} }
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)) { {
return null; if ((propertiesContext.IsProjectFile == true))
} {
else { return null;
return propertiesContext.File; }
} else
} {
return propertiesContext.File;
}
}
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
return; if ((this.configuredProject == null))
} {
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule; return;
if ((unboundRule == null)) { }
System.IO.Stream xamlStream = null; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); if ((unboundRule == null))
try { {
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml"); System.IO.Stream xamlStream = null;
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); try
for ( {
; ((unboundRule == null) xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml");
&& ruleEnumerator.MoveNext()); 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();
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); for (
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { ; ((unboundRule == null)
unboundRule = t; && ruleEnumerator.MoveNext());
unboundRule.Name = "e0400917-b7e9-4731-b3e6-447b229db9d4"; )
RazorGeneral.deserializedFallbackRule = unboundRule; {
} Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
} if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
} {
finally { unboundRule = t;
if ((xamlStream != null)) { unboundRule.Name = "6851f2efc446915a1288ec829aa82f7dc9bcfc6addb65b97866a1bc9e30b3348";
((System.IDisposable)(xamlStream)).Dispose(); RazorGeneral.deserializedFallbackRule = unboundRule;
} }
} }
} }
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext"); finally
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext"); {
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName); if ((xamlStream != null))
} {
} ((System.IDisposable)(xamlStream)).Dispose();
}
}
}
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
}
}
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)); {
return new RazorGeneral(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); RazorProjectProperties that = ((RazorProjectProperties)(state));
} 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(); {
return namedCatalogsTask.ContinueWith(CreateRazorGeneralPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); 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);
} }
/// <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;
}
}
} }

405
src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs
View File

@ -8,205 +8,268 @@
// </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;
/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary> /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
internal const string SchemaName = "RazorGenerateWithTargetPath"; internal const string SchemaName = "RazorGenerateWithTargetPath";
/// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary> /// <summary>The ItemType given in the Rule.DataSource property. May not apply to every Property's individual DataSource.</summary>
internal const string PrimaryDataSourceItemType = "RazorGenerateWithTargetPath"; internal const string PrimaryDataSourceItemType = "RazorGenerateWithTargetPath";
/// <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>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
/// <summary>Backing field for the file name of the rule property.</summary> /// <summary>Backing field for the file name of the rule property.</summary>
private string file; private string file;
/// <summary>Backing field for the ItemType property.</summary> /// <summary>Backing field for the ItemType property.</summary>
private string itemType; private string itemType;
/// <summary>Backing field for the ItemName property.</summary> /// <summary>Backing field for the ItemName property.</summary>
private string itemName; private string itemName;
/// <summary>Configured Project</summary> /// <summary>Configured Project</summary>
private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject; private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
/// <summary>The dictionary of named catalogs.</summary> /// <summary>The dictionary of named catalogs.</summary>
private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs; private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary> /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule; private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
/// <summary>Thread locking object</summary> /// <summary>Thread locking object</summary>
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)) { {
throw new System.ArgumentNullException("configuredProject"); if ((configuredProject == null))
} {
this.configuredProject = configuredProject; throw new System.ArgumentNullException("configuredProject");
this.catalogs = catalogs; }
this.file = file; this.configuredProject = configuredProject;
this.itemType = itemType; this.catalogs = catalogs;
this.itemName = itemName; this.file = file;
} this.itemType = itemType;
this.itemName = itemName;
}
/// <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)) { {
throw new System.ArgumentNullException("rule"); if ((rule == null))
} {
if ((configuredProject == null)) { throw new System.ArgumentNullException("rule");
throw new System.ArgumentNullException("configuredProject"); }
} if ((configuredProject == null))
this.configuredProject = configuredProject; {
this.rule = rule; throw new System.ArgumentNullException("configuredProject");
this.file = this.rule.File; }
this.itemType = this.rule.ItemType; this.configuredProject = configuredProject;
this.itemName = this.rule.ItemName; this.rule = rule;
} this.file = this.rule.File;
this.itemType = this.rule.ItemType;
this.itemName = this.rule.ItemName;
}
/// <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 { {
return this.rule; get
} {
} 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 { {
Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule; get
if ((localRule == null)) { {
localRule = this.GeneratedFallbackRule; Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
} if ((localRule == null))
if ((localRule == null)) { {
return null; localRule = this.GeneratedFallbackRule;
} }
Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty))); if ((localRule == null))
if (((property == null) {
&& (this.GeneratedFallbackRule != null))) { return null;
localRule = this.GeneratedFallbackRule; }
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)
return property; && (this.GeneratedFallbackRule != null)))
} {
} localRule = this.GeneratedFallbackRule;
property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
}
return property;
}
}
/// <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 { {
if (((this.fallbackRule == null) get
&& (this.configuredProject != null))) { {
System.Threading.Monitor.Enter(this.locker); if (((this.fallbackRule == null)
try { && (this.configuredProject != null)))
if ((this.fallbackRule == null)) { {
this.InitializeFallbackRule(); System.Threading.Monitor.Enter(this.locker);
} try
} {
finally { if ((this.fallbackRule == null))
System.Threading.Monitor.Exit(this.locker); {
} this.InitializeFallbackRule();
} }
return this.fallbackRule; }
} finally
} {
System.Threading.Monitor.Exit(this.locker);
}
}
return this.fallbackRule;
}
}
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)) { {
return null; if ((catalog == null))
} {
return catalog.BindToContext(SchemaName, file, itemType, itemName); return null;
} }
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)) { {
return null; if ((propertiesContext.IsProjectFile == true))
} {
else { return null;
return propertiesContext.File; }
} else
} {
return propertiesContext.File;
}
}
private void InitializeFallbackRule() { private void InitializeFallbackRule()
if ((this.configuredProject == null)) { {
return; if ((this.configuredProject == null))
} {
Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule; return;
if ((unboundRule == null)) { }
System.IO.Stream xamlStream = null; Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule;
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); if ((unboundRule == null))
try { {
xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml"); System.IO.Stream xamlStream = null;
Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream))); System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator(); try
for ( {
; ((unboundRule == null) xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml");
&& ruleEnumerator.MoveNext()); 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();
Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current)); for (
if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) { ; ((unboundRule == null)
unboundRule = t; && ruleEnumerator.MoveNext());
unboundRule.Name = "4d01f23e-96db-4c90-9c01-17b7f8b61243"; )
RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule; {
} Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
} if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
} {
finally { unboundRule = t;
if ((xamlStream != null)) { unboundRule.Name = "4325a10cce970a389c33b97140c4307d2e10664e053c75cf9e0e0fd08288774f";
((System.IDisposable)(xamlStream)).Dispose(); RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule;
} }
} }
} }
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext"); finally
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext"); {
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName); if ((xamlStream != null))
} {
} ((System.IDisposable)(xamlStream)).Dispose();
}
}
}
this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
}
}
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)); {
return new RazorGenerateWithTargetPath(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName); RazorProjectProperties that = ((RazorProjectProperties)(state));
} 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(); {
return namedCatalogsTask.ContinueWith(CreateRazorGenerateWithTargetPathPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default); 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);
} }
/// <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;
}
}
} }

107
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs
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