Skip to content

Commit

Permalink
Revert "Adds unified settings with migration (#9108)" (#9129)
Browse files Browse the repository at this point in the history
This reverts commit 44565c3.

Co-authored-by: Adam Ratzman <[email protected]>
  • Loading branch information
adamint and Adam Ratzman authored Jun 28, 2023
1 parent a524d45 commit 2eca631
Show file tree
Hide file tree
Showing 21 changed files with 13 additions and 1,019 deletions.
1 change: 0 additions & 1 deletion eng/imports/RepoLayout.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<VisualStudioSetupInsertionPath>$(VisualStudioSetupOutputPath)Insertion\</VisualStudioSetupInsertionPath>
<VisualStudioSetupIntermediateOutputPath>$(ArtifactsConfigurationDir)VSSetup.obj\</VisualStudioSetupIntermediateOutputPath>
<VisualStudioXamlRulesDir>$(VisualStudioSetupOutputPath)Rules\</VisualStudioXamlRulesDir>
<VisualStudioExtensionSetupDir>$(RepoRoot)setup\</VisualStudioExtensionSetupDir>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,3 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hant"
file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedProjectReference.xaml"
file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedSdkReference.xaml"
file source="$(VisualStudioXamlRulesDir)zh-Hant\SdkReference.xaml"

folder "Extensions\Microsoft\ManagedProjectSystem\UnifiedSettings"
file source="$(VisualStudioExtensionSetupDir)\ProjectSystemSetup\UnifiedSettings\ManagedProjectSystem.registration.json"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<!-- This allows passing in MSBuild properties for substitution in SWR files. -->
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VisualStudioXamlRulesDir=$(VisualStudioXamlRulesDir);VisualStudioExtensionSetupDir=$(VisualStudioExtensionSetupDir)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VisualStudioXamlRulesDir=$(VisualStudioXamlRulesDir)</PackagePreprocessorDefinitions>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions setup/ProjectSystemSetup/ProjectSystemSetup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
</PropertyGroup>

<ItemGroup>
<Content Include="UnifiedSettings\ManagedProjectSystem.registration.json">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>

<ProjectReference Include="..\..\src\Microsoft.VisualStudio.ProjectSystem.Managed.VS\Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj">
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup;PkgdefProjectOutputGroup</IncludeOutputGroupsInVSIX>
</ProjectReference>
Expand Down

This file was deleted.

39 changes: 0 additions & 39 deletions src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx
Original file line number Diff line number Diff line change
Expand Up @@ -168,43 +168,4 @@
<data name="27" xml:space="preserve">
<value>.NET Core 2015 Project Files (*.xproj);*.xproj</value>
</data>
<data name="Setting_FastUpToDateCheck_Enabled_Title">
<value>Don't call MSBuild if a project appears to be up to date</value>
</data>
<data name="Setting_FastUpToDateCheck_LoggingLevel_Title">
<value>Logging Level</value>
</data>
<data name="Setting_FastUpToDateCheck_LoggingLevel_None">
<value>None</value>
</data>
<data name="Setting_FastUpToDateCheck_LoggingLevel_Minimal">
<value>Minimal</value>
</data>
<data name="Setting_FastUpToDateCheck_LoggingLevel_Info">
<value>Info</value>
</data>
<data name="Setting_FastUpToDateCheck_LoggingLevel_Verbose">
<value>Verbose</value>
</data>
<data name="Setting_FileNesting_IgnoreSolutionAndProjectSettings_Title">
<value>Ignore solution and project settings</value>
</data>
<data name="Setting_FileNesting_PreferSingleTargetBuilds_Title">
<value>Prefer single-target builds when starting a project</value>
</data>
<data name="Setting_FileNesting_PreferSingleTargetBuilds_Description">
<value>When starting a project that targets multiple frameworks the build time can be reduced by building only a single one.</value>
</data>
<data name="Settings_Category_SdkStyleProjects">
<value>SDK-style projects</value>
</data>
<data name="Settings_Category_FastUpToDateCheck">
<value>Up to date checks</value>
</data>
<data name="Settings_Category_FileNestingSettings">
<value>File nesting settings</value>
</data>
<data name="Settings_Category_MultiTargetingSettings">
<value>Multi-targeting settings</value>
</data>
</root>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2eca631

Please sign in to comment.