Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc cleanup: Delete unused scripts and build logic #6492

Merged
merged 5 commits into from
Jan 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ if "%DevEnvDir%" == "" (
)

set TFS_SourcesDirectory=%~dp0
set XES_DFSDROP=%~dp0BuildOutput
set BUILD_BINARIESDIRECTORY=%~dp0BuildOutput
set VERSIONBUILDNUMBER=local
set VERSIONBUILDREVISION=10001
Expand Down Expand Up @@ -132,7 +131,6 @@ if "%PROJECTPATH%" NEQ "" (
!MSBuildCommand!
) else (
if "%BUILDALL%" == "" (
set XES_OUTDIR=%BUILD_BINARIESDIRECTORY%\%BUILDCONFIGURATION%\%BUILDPLATFORM%\

"%MSBUILDPATH%" .\MUXControls.sln /p:platform="%BUILDPLATFORM%" /p:configuration="%BUILDCONFIGURATION%" /flp:Verbosity=Diagnostic /fl /bl %EXTRAMSBUILDPARAMS% /verbosity:Minimal /p:AppxBundle=Never /p:AppxSymbolPackageEnabled=false

Expand All @@ -150,16 +148,6 @@ if "%PROJECTPATH%" NEQ "" (
call .\tools\MakeAppxHelper.cmd arm64 release
call .\tools\MakeAppxHelper.cmd arm64 debug
)

REM
REM PostBuild
REM
call .\tools\PostBuild.cmd

REM
REM PkgGen
REM
REM call .\tools\pkggen.cmd
)
)

Expand Down
48 changes: 0 additions & 48 deletions CustomInlineTasks.targets
Original file line number Diff line number Diff line change
Expand Up @@ -39,54 +39,6 @@
File.WriteAllText(DestinationFiles[i], text);
}
}
]]>
</Code>
</Task>
</UsingTask>
<UsingTask Condition="$(BuildingWithBuildExe) == 'true'" TaskName="RunPowershellScript" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
<ParameterGroup>
<Path ParameterType="System.String" Required="true" />
<Parameters ParameterType="System.String" Required="false" />
<FilesWritten ParameterType="System.String[]" Required="false" />
</ParameterGroup>
<Task>
<Using Namespace="System" />
<Using Namespace="System.Diagnostics" />
<Code Type="Fragment" Language="cs">
<![CDATA[
// pshrun.cmd is the script file to call if you want to execute a PowerShell script
// as part of a Razzle build.
string pshrunPath = Environment.GetEnvironmentVariable("RazzleToolPath") + "\\pshrun.cmd";

// We're passing a string as a script parameter twice (one to pshrun.cmd, one to pshrun.ps1),
// so we need to doubly-escape the string to make sure it survives both passages.
string pshrunParameters = Path + " " + Parameters.Replace("\"", "\"\"\"");

ProcessStartInfo processStartInfo = new ProcessStartInfo(pshrunPath, pshrunParameters);
processStartInfo.CreateNoWindow = true;
processStartInfo.UseShellExecute = false;
processStartInfo.WindowStyle = ProcessWindowStyle.Hidden;
processStartInfo.RedirectStandardOutput = true;

Log.LogMessage(string.Format("Running {0} {1}...", pshrunPath, pshrunParameters));

Process process = Process.Start(processStartInfo);
Console.WriteLine(process.StandardOutput.ReadToEnd());

// The bool "Success" is defined in codegen as the return value for inline MSBuild tasks such as this one.
Success = process.WaitForExit(60000) && process.ExitCode == 0;
process.Close();

if (!Success)
{
foreach (string filePath in FilesWritten)
{
if (File.Exists(filePath))
{
File.Delete(filePath);
}
}
}
]]>
</Code>
</Task>
Expand Down
8 changes: 4 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
Adding Sdk="Microsoft.NET.Sdk" to a project causes NuGet files to be generated very early on, so we need these defines to be here
to ensure that all of our build output files end up in the same location. This is parsed too late when put in mux.controls.props. -->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="$(BuildingWithBuildExe) != 'true'">
<IsTDPConfiguration>false</IsTDPConfiguration>
<IsTDPConfiguration Condition="'$(Configuration)' == 'Debug_test'">true</IsTDPConfiguration>
<PropertyGroup>
<IsDebugTestConfiguration>false</IsDebugTestConfiguration>
<IsDebugTestConfiguration Condition="'$(Configuration)' == 'Debug_test'">true</IsDebugTestConfiguration>
<Configuration Condition="'$(Configuration)' == 'Debug_test'">Debug</Configuration>

<BaseOutputPath>$(MSBuildThisFileDirectory)BuildOutput\$(Configuration)\</BaseOutputPath>
<BaseOutputPath Condition="'$(Configuration)' == 'Debug_test'">$(MSBuildThisFileDirectory)BuildOutput\Debug\</BaseOutputPath>
<BaseOutputPath Condition="'$(Configuration)' == 'Debug_test'">$(MSBuildThisFileDirectory)BuildOutput\Debug\</BaseOutputPath>
<OutDir>$(BaseOutputPath)\$(Platform)\</OutDir>

<!-- For native projects that use Win32 to mean x86, override the OutDir
Expand Down
18 changes: 0 additions & 18 deletions MUXControls.sln
Original file line number Diff line number Diff line change
Expand Up @@ -38,36 +38,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5EF3865D
Build.cmd = Build.cmd
tools\CheckCompatibility.cmd = tools\CheckCompatibility.cmd
tools\CheckCompatibility.ps1 = tools\CheckCompatibility.ps1
tools\CodeGenHelpers.psm1 = tools\CodeGenHelpers.psm1
DevCmd.cmd = DevCmd.cmd
tools\ExtractPackageDependencies.cmd = tools\ExtractPackageDependencies.cmd
tools\ExtractPackageDependencies.ps1 = tools\ExtractPackageDependencies.ps1
tools\GenerateAppxDependenciesXML.cmd = tools\GenerateAppxDependenciesXML.cmd
tools\GenerateAppxDependenciesXML.ps1 = tools\GenerateAppxDependenciesXML.ps1
tools\GenerateNewProperty.ps1 = tools\GenerateNewProperty.ps1
tools\GenerateSystemDllImageResources.ps1 = tools\GenerateSystemDllImageResources.ps1
tools\GenerateSystemDllStringResources.ps1 = tools\GenerateSystemDllStringResources.ps1
tools\GenerateVisualVerificationUpdates.ps1 = tools\GenerateVisualVerificationUpdates.ps1
tools\GenerateXamlMetadata.ps1 = tools\GenerateXamlMetadata.ps1
tools\GenerateXamlMetadataWindowsCodeGen.ps1 = tools\GenerateXamlMetadataWindowsCodeGen.ps1
tools\LaunchXde.cmd = tools\LaunchXde.cmd
tools\LaunchXde.ps1 = tools\LaunchXde.ps1
tools\MakeAppxHelper.cmd = tools\MakeAppxHelper.cmd
tools\MakeVSIXHelper.cmd = tools\MakeVSIXHelper.cmd
nuget.config = nuget.config
tools\NugetWrapper.cmd = tools\NugetWrapper.cmd
tools\PkgGen.cmd = tools\PkgGen.cmd
tools\PostBuild.cmd = tools\PostBuild.cmd
tools\PostBuildWrapper.cmd = tools\PostBuildWrapper.cmd
tools\PostTestsWrapper.cmd = tools\PostTestsWrapper.cmd
tools\PowershellWrapper.cmd = tools\PowershellWrapper.cmd
tools\ps.bat = tools\ps.bat
tools\PSProfile.ps1 = tools\PSProfile.ps1
tools\PublishChunk.cmd = tools\PublishChunk.cmd
tools\PublishNupkg.cmd = tools\PublishNupkg.cmd
RunTests.ps1 = RunTests.ps1
tools\sign.cmd = tools\sign.cmd
tools\UninstallVSIX.cmd = tools\UninstallVSIX.cmd
tools\Utils.psm1 = tools\Utils.psm1
EndProjectSection
EndProject
Expand Down
148 changes: 0 additions & 148 deletions build/FrameworkPackage/UpdateAppxFilesInNupkg.ps1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)Microsoft.UI.Private.Composition.Effects_impl.h" />
</ItemGroup>
<ItemGroup>
<Midl Include="$(MSBuildThisFileDirectory)Microsoft.UI.Private.Composition.Effects.idl" Condition="$(BuildingWithBuildExe) != 'true'">
<Midl Include="$(MSBuildThisFileDirectory)Microsoft.UI.Private.Composition.Effects.idl" >
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\..;$(MiniWindowsSDKIncludePath)</AdditionalIncludeDirectories>
<AdditionalMetadataDirectories Condition="'$(MiniWindowsSDKWinMDPath)'!=''">$(MiniWindowsSDKWinMDPath)</AdditionalMetadataDirectories>
<OutputDirectory>$(OutDir)</OutputDirectory>
Expand Down
3 changes: 1 addition & 2 deletions dev/Microsoft.UI.Xaml.Design/Microsoft.UI.Xaml.Design.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProjectDirectory)\..\..\mux.controls.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\mux.controls.props') And $(BuildingWithBuildExe) != 'true'" />
<Import Project="$(MSBuildProjectDirectory)\..\..\mux.controls.props" />
<Import Project="$(MSBuildProjectDirectory)\..\..\environment.props" />
<Import Project="$(MSBuildProjectDirectory)\..\..\SdkVersion.props" Condition="$(BuildingWithBuildExe) == 'true'" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<ProjectGuid>{1CEEC8E3-419A-4304-841C-08A334B9E4FF}</ProjectGuid>
Expand Down
16 changes: 6 additions & 10 deletions dev/Repeater/Repeater.vcxitems
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,16 @@
<ClInclude Include="$(MSBuildThisFileDirectory)ChildrenInTabFocusOrderIterable.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)BuildTreeScheduler.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)CustomProperty.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementFactoryRecycleArgs.h" Condition="$(BuildingWithBuildExe) != 'true'" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementFactoryRecycleArgsDownlevel.h" Condition="$(BuildingWithBuildExe) == 'true'" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementFactoryRecycleArgs.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemsSourceView.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementAnimator.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemsRepeaterElementClearingEventArgs.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemsRepeaterElementIndexChangedEventArgs.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementManager.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemsRepeaterElementPreparedEventArgs.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementFactoryGetArgs.h" Condition="$(BuildingWithBuildExe) != 'true'" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementFactoryGetArgsDownlevel.h" Condition="$(BuildingWithBuildExe) == 'true'" />
<ClInclude Include="$(MSBuildThisFileDirectory)ElementFactoryGetArgs.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemsSourceViewFactory.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemTemplateWrapper.h" Condition="$(BuildingWithBuildExe) != 'true'" />
<ClInclude Include="$(MSBuildThisFileDirectory)ItemTemplateWrapper.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)LayoutContextAdapter.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)NonVirtualizingLayout.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)NonvirtualizingLayoutContext.h" />
Expand Down Expand Up @@ -94,8 +92,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)ChildrenInTabFocusOrderIterable.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)BuildTreeScheduler.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)CustomProperty.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementFactoryRecycleArgs.cpp" Condition="$(BuildingWithBuildExe) != 'true'" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementFactoryRecycleArgsDownlevel.cpp" Condition="$(BuildingWithBuildExe) == 'true'" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementFactoryRecycleArgs.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ItemsSourceView.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementAnimator.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ItemsRepeaterElementClearingEventArgs.cpp" />
Expand All @@ -104,12 +101,11 @@
<ClCompile Include="$(MSBuildThisFileDirectory)ItemsSourceViewFactory.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ItemsRepeaterScrollHost.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementManager.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ItemTemplateWrapper.cpp" Condition="$(BuildingWithBuildExe) != 'true'" />
<ClCompile Include="$(MSBuildThisFileDirectory)ItemTemplateWrapper.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)LayoutContextAdapter.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)NonVirtualizingLayout.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)NonvirtualizingLayoutContext.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementFactoryGetArgs.cpp" Condition="$(BuildingWithBuildExe) != 'true'" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementFactoryGetArgsDownlevel.cpp" Condition="$(BuildingWithBuildExe) == 'true'" />
<ClCompile Include="$(MSBuildThisFileDirectory)ElementFactoryGetArgs.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)SelectionModelChildrenRequestedEventArgs.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)UniformGridLayout.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)FlowLayout.cpp" />
Expand Down
18 changes: 0 additions & 18 deletions dev/dll/product.pbxproj

This file was deleted.

Loading