Skip to content

Commit

Permalink
Merge pull request #4489 from davkean/StopLocalizingRuleFiles
Browse files Browse the repository at this point in the history 
Stop localizing AppDesigner/CompilerCommandLineArgs rules
  • Loading branch information
@davkean
davkean committed Jan 24, 2019
2 parents 8098215 + 0ae2a36 commit 1f55190
Show file tree
Hide file tree
Showing 102 changed files with 40 additions and 1,572 deletions.
105 changes: 0 additions & 105 deletions setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr
View file

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions ...ft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
View file
Expand Up @@ -196,18 +196,22 @@
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\UpToDateCheckInput.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\UpToDateCheckOutput.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\UpToDateCheckBuilt.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\CopyUpToDateMarker.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
Expand Down Expand Up @@ -253,6 +257,7 @@
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\NuGetRestore.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
Expand Down Expand Up @@ -287,10 +292,14 @@
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\AppDesigner.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\CompilerCommandLineArgs.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\PackageReference.xaml">
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
Expand All @@ -317,6 +326,7 @@
<SubType>Designer</SubType>
</XamlPropertyRule>
<XamlPropertyRule Include="ProjectSystem\Rules\ResolvedCompilationReference.xaml">
<XlfInput>false</XlfInput>
<Generator>MSBuild:GenerateRuleSourceFromXaml</Generator>
<SubType>Designer</SubType>
</XamlPropertyRule>
Expand Down
54 changes: 28 additions & 26 deletions ...rojectSystem.Managed/ProjectSystem/DesignTimeTargets/Microsoft.Managed.DesignTime.targets
View file
Expand Up @@ -156,10 +156,6 @@
<Context>BrowseObject</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)CopyUpToDateMarker.xaml">
<Context>File</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)EmbeddedResource.xaml">
<Context>File</Context>
</PropertyPageSchema>
Expand Down Expand Up @@ -192,18 +188,6 @@
<Context>File;ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)UpToDateCheckInput.xaml">
<Context>File</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)UpToDateCheckOutput.xaml">
<Context>File</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)UpToDateCheckBuilt.xaml">
<Context>File</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)XamlAppDef.xaml">
<Context>File</Context>
</PropertyPageSchema>
Expand All @@ -221,17 +205,43 @@
</PropertyPageSchema>

<!-- Project related settings -->
<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)AppDesigner.xaml">
<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)AppDesigner.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)CompilerCommandLineArgs.xaml">
<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)CompilerCommandLineArgs.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)LanguageService.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<!-- NuGet Restore Properties -->
<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)NuGetRestore.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<!-- Up-to-date check -->
<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)ResolvedCompilationReference.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)CopyUpToDateMarker.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)UpToDateCheckInput.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)UpToDateCheckOutput.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlNeutralResourcesDirectory)UpToDateCheckBuilt.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)ConfigurationGeneral.xaml">
<Context>Project;ProjectSubscriptionService</Context>
Expand Down Expand Up @@ -310,11 +320,6 @@
<Context>ProjectSubscriptionService;BrowseObject</Context>
</PropertyPageSchema>

<!-- NuGet Restore Properties -->
<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)NuGetRestore.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>

<!-- Analyzer references -->
<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)AnalyzerReference.xaml">
<Context>Project;ProjectSubscriptionService;BrowseObject</Context>
Expand All @@ -324,9 +329,6 @@
<Context>ProjectSubscriptionService;BrowseObject</Context>
</PropertyPageSchema>

<PropertyPageSchema Include="$(ManagedXamlResourcesDirectory)ResolvedCompilationReference.xaml">
<Context>ProjectSubscriptionService</Context>
</PropertyPageSchema>
</ItemGroup>

<!-- List of external files that trigger design-time builds when they are modified -->
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/AppDesigner.xaml
View file
Expand Up @@ -2,9 +2,7 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Rule
Name="AppDesigner"
DisplayName="AppDesigner"
PageTemplate="generic"
Description="General"
xmlns="http://schemas.microsoft.com/build/2009/properties">

<Rule.DataSource>
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/NuGetRestore.xaml
View file
Expand Up @@ -2,9 +2,7 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Rule
Name="NuGetRestore"
DisplayName="NuGetRestore"
PageTemplate="generic"
Description="General Configuration Properties used in NuGet Restore"
xmlns="http://schemas.microsoft.com/build/2009/properties">

<Rule.DataSource>
Expand Down
4 changes: 1 addition & 3 deletions ....VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/ResolvedCompilationReference.xaml
View file
Expand Up @@ -2,16 +2,14 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Rule
Name="ResolvedCompilationReference"
DisplayName="Resolved Compilation Reference"
PageTemplate="generic"
Description="Resolved Compilation Reference Properties"
xmlns="http://schemas.microsoft.com/build/2009/properties">
<Rule.DataSource>
<DataSource Persistence="ResolvedReference" ItemType="ReferencePathWithRefAssemblies" HasConfigurationCondition="False" SourceOfDefaultValue="AfterContext"
SourceType="TargetResults" MSBuildTarget="CollectResolvedCompilationReferencesDesignTime"/>
</Rule.DataSource>

<StringProperty Name="ResolvedPath" ReadOnly="True" DisplayName="Path" Description="Location of the referenced assembly.">
<StringProperty Name="ResolvedPath" ReadOnly="True">
<StringProperty.DataSource>
<DataSource PersistedName="Identity" SourceOfDefaultValue="AfterContext" />
</StringProperty.DataSource>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/UpToDateCheckBuilt.xaml
View file
Expand Up @@ -6,5 +6,5 @@
SourceType="TargetResults" MSBuildTarget="CollectUpToDateCheckBuiltDesignTime"/>
</Rule.DataSource>
<BoolProperty Name="Visible" Visible="False" ReadOnly="True" />
<StringProperty Name="Original" Category="Misc" Description="If set, specifies that this built output comes from this source file." />
<StringProperty Name="Original" /> <!-- If set, specifies that this built output comes from this source file. -->
</Rule>
17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.cs.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.de.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.es.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.fr.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.it.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.ja.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.ko.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.pl.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...oft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.pt-BR.xlf
View file

This file was deleted.

17 changes: 0 additions & 17 deletions ...rosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/xlf/AppDesigner.xaml.ru.xlf
View file

This file was deleted.

0 comments on commit 1f55190

Please sign in to comment.