Skip to content

Commit

Permalink
Shifting from solution dir to actual local path (#34204)
Browse files Browse the repository at this point in the history
<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request

learning from #34177 that
solution dir could have rippling effects from other the dart pipeline.
This shifts those over to relative paths

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] **Closes:** #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end user facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
  • Loading branch information
crutkas committed Aug 8, 2024
1 parent fb5ed13 commit 4ea34c2
Show file tree
Hide file tree
Showing 34 changed files with 35 additions and 101 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<Import Condition="exists('src\Version.props')" Project="src\Version.props" />
<Import Project="src\Version.props" />
<PropertyGroup>
<Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\Common.SelfContained.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.FileLocksmith</AssemblyTitle>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/Hosts/Hosts/Hosts.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.MeasureTool</AssemblyTitle>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.MouseJumpUI</AssemblyTitle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/PowerOCR/PowerOCR/PowerOCR.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.PowerOCR</AssemblyTitle>
Expand Down
6 changes: 2 additions & 4 deletions src/modules/awake/Awake/Awake.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.ColorPickerUI</AssemblyTitle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.FancyZonesEditor</AssemblyTitle>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/imageresizer/ui/ImageResizerUI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.ImageResizer</AssemblyTitle>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/launcher/PowerLauncher/PowerLauncher.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyTitle>PowerToys.Run</AssemblyTitle>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/peek/Peek.UI/Peek.UI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<AssemblyName>PowerToys.Peek.UI</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
Expand Down
4 changes: 1 addition & 3 deletions src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\Common.SelfContained.props" />
<PropertyGroup>
<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
Expand Down
4 changes: 1 addition & 3 deletions src/settings-ui/Settings.UI/PowerToys.Settings.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well -->
<Import
Condition="exists('$(SolutionDir)src\Common.SelfContained.props')"
Project="$(SolutionDir)src\Common.SelfContained.props" />
<Import Project="..\..\Common.SelfContained.props" />

<PropertyGroup>
<OutputType>WinExe</OutputType>
Expand Down

0 comments on commit 4ea34c2

Please sign in to comment.