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.

Sign up for GitHub

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

Jump to bottom

Replaced GetDirectoryNameOfFileAbove with GetPathOfFileAbove #43462

Closed
wants to merge 7 commits into from
Closed

Replaced GetDirectoryNameOfFileAbove with GetPathOfFileAbove #43462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6bae3fb
Replaced "$([MSBuild]::GetDirectoryNameOfFileAbove(" with "$([MSBuild…
TaurahSai Oct 16, 2020
cb6a001
resolve sdk version
TaurahSai Oct 17, 2020
0d1761b
change path of configuration file for MsBuild
TaurahSai Oct 19, 2020
641aa91
Modified relative path
TaurahSai Oct 20, 2020
9ce20b0
testing with original path
TaurahSai Oct 20, 2020
ee6fa14
added correct path for props file
TaurahSai Oct 23, 2020
e4d94af
Merge branch 'master' into issue-30468
danmoseley Dec 15, 2020
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
1 change: 1 addition & 0 deletions src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
1 change: 1 addition & 0 deletions src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64
1 change: 1 addition & 0 deletions .../corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
1 change: 1 addition & 0 deletions src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestUtils/TestProjects.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
in a different manner than using the $(RepositoryEngineeringDir) variable.
-->

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),global.json))\eng\Configurations.props" />
<Import Project="$([MSBuild]::GetPathOfFileAbove(Configurations.props,$(MSBuildThisFileDirectory)))../../../../../eng/Configurations.props" />

<PropertyGroup>
<!--
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Bcl.AsyncInterfaces.csproj">
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
1 change: 1 addition & 0 deletions ...tive/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
1 change: 1 addition & 0 deletions src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64
1 change: 1 addition & 0 deletions ...e/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
1 change: 1 addition & 0 deletions src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64
2 changes: 1 addition & 1 deletion src/libraries/pkg/test/project.csproj.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NETCoreAppMaximumVersion>99.0</NETCoreAppMaximumVersion>

<SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support</SupportFilesDir>
<SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))</SupportFilesDir>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
1 change: 1 addition & 0 deletions src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64
1 change: 1 addition & 0 deletions src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
1 change: 1 addition & 0 deletions src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64