From 6bae3fb5085ba593e5d0c27d22250a11f063cbef Mon Sep 17 00:00:00 2001 From: Keshav Taurah Date: Fri, 16 Oct 2020 00:04:37 -0700 Subject: [PATCH 1/6] Replaced "$([MSBuild]::GetDirectoryNameOfFileAbove(" with "$([MSBuild]::GetPathOfFileAbove(" --- global.json | 2 +- .../.cmake/api/v1/query/client-MicrosoftVS/query.json | 1 + .../out/build/x64-Debug (default)/VSInheritEnvironments.txt | 1 + .../.cmake/api/v1/query/client-MicrosoftVS/query.json | 1 + .../out/build/x64-Debug (default)/VSInheritEnvironments.txt | 1 + src/installer/tests/Assets/TestUtils/TestProjects.props | 2 +- .../pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj | 6 +++--- .../.cmake/api/v1/query/client-MicrosoftVS/query.json | 1 + .../out/build/x64-Debug (default)/VSInheritEnvironments.txt | 1 + .../.cmake/api/v1/query/client-MicrosoftVS/query.json | 1 + .../out/build/x64-Debug (default)/VSInheritEnvironments.txt | 1 + src/libraries/pkg/test/project.csproj.template | 2 +- .../.cmake/api/v1/query/client-MicrosoftVS/query.json | 1 + .../out/build/x64-Debug (default)/VSInheritEnvironments.txt | 1 + .../.cmake/api/v1/query/client-MicrosoftVS/query.json | 1 + .../out/build/x64-Debug (default)/VSInheritEnvironments.txt | 1 + 16 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json create mode 100644 src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt create mode 100644 src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json create mode 100644 src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt create mode 100644 src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json create mode 100644 src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt create mode 100644 src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json create mode 100644 src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt create mode 100644 src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json create mode 100644 src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt create mode 100644 src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json create mode 100644 src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt diff --git a/global.json b/global.json index 6692397bbcc8f4..088aff349c86e6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.100-preview.8.20417.9", + "version": "3.1.402", "allowPrerelease": true, "rollForward": "major" }, diff --git a/src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json new file mode 100644 index 00000000000000..308f68dd8c5fa3 --- /dev/null +++ b/src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json @@ -0,0 +1 @@ +{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]} \ No newline at end of file diff --git a/src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt new file mode 100644 index 00000000000000..f8cc9d8acececa --- /dev/null +++ b/src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt @@ -0,0 +1 @@ +msvc_x64_x64 \ No newline at end of file diff --git a/src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json new file mode 100644 index 00000000000000..308f68dd8c5fa3 --- /dev/null +++ b/src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json @@ -0,0 +1 @@ +{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]} \ No newline at end of file diff --git a/src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt new file mode 100644 index 00000000000000..f8cc9d8acececa --- /dev/null +++ b/src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt @@ -0,0 +1 @@ +msvc_x64_x64 \ No newline at end of file diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index 46ff7500357656..8dd88633d00a29 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -6,7 +6,7 @@ in a different manner than using the $(RepositoryEngineeringDir) variable. --> - + diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj index f0630aaef6ecc1..71bd0902566ae0 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj @@ -1,9 +1,9 @@ - + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - - \ No newline at end of file + + diff --git a/src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json new file mode 100644 index 00000000000000..308f68dd8c5fa3 --- /dev/null +++ b/src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json @@ -0,0 +1 @@ +{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]} \ No newline at end of file diff --git a/src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt new file mode 100644 index 00000000000000..f8cc9d8acececa --- /dev/null +++ b/src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt @@ -0,0 +1 @@ +msvc_x64_x64 \ No newline at end of file diff --git a/src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json new file mode 100644 index 00000000000000..308f68dd8c5fa3 --- /dev/null +++ b/src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json @@ -0,0 +1 @@ +{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]} \ No newline at end of file diff --git a/src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt new file mode 100644 index 00000000000000..f8cc9d8acececa --- /dev/null +++ b/src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt @@ -0,0 +1 @@ +msvc_x64_x64 \ No newline at end of file diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index 0eaabeb356c3ce..38640b446e3341 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -9,7 +9,7 @@ false 99.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support + $([MSBuild]::GetPathOfFileAbove(Directory.Build.props)) diff --git a/src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json new file mode 100644 index 00000000000000..308f68dd8c5fa3 --- /dev/null +++ b/src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json @@ -0,0 +1 @@ +{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]} \ No newline at end of file diff --git a/src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt new file mode 100644 index 00000000000000..f8cc9d8acececa --- /dev/null +++ b/src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt @@ -0,0 +1 @@ +msvc_x64_x64 \ No newline at end of file diff --git a/src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json new file mode 100644 index 00000000000000..308f68dd8c5fa3 --- /dev/null +++ b/src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json @@ -0,0 +1 @@ +{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]} \ No newline at end of file diff --git a/src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt new file mode 100644 index 00000000000000..f8cc9d8acececa --- /dev/null +++ b/src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt @@ -0,0 +1 @@ +msvc_x64_x64 \ No newline at end of file From cb6a001ec3f46a2505cb4919f4a620f626f0978e Mon Sep 17 00:00:00 2001 From: Keshav Taurah Date: Fri, 16 Oct 2020 21:31:23 -0700 Subject: [PATCH 2/6] resolve sdk version --- global.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/global.json b/global.json index 088aff349c86e6..e850e0905afbc0 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { - "sdk": { - "version": "3.1.402", - "allowPrerelease": true, - "rollForward": "major" - }, + "sdk": { + "version": "5.0.100-preview.8.20417.9", + "allowPrerelease": true, + "rollForward": "major" + }, "tools": { "dotnet": "5.0.100-rc.1.20454.5" }, From 0d1761b130905ab985672ea9adc503068c172193 Mon Sep 17 00:00:00 2001 From: Keshav Taurah Date: Sun, 18 Oct 2020 20:03:02 -0700 Subject: [PATCH 3/6] change path of configuration file for MsBuild --- global.json | 10 +++++----- .../tests/Assets/TestUtils/TestProjects.props | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/global.json b/global.json index e850e0905afbc0..6692397bbcc8f4 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { - "sdk": { - "version": "5.0.100-preview.8.20417.9", - "allowPrerelease": true, - "rollForward": "major" - }, + "sdk": { + "version": "5.0.100-preview.8.20417.9", + "allowPrerelease": true, + "rollForward": "major" + }, "tools": { "dotnet": "5.0.100-rc.1.20454.5" }, diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index 8dd88633d00a29..f7a7acc5eefa93 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -6,7 +6,7 @@ in a different manner than using the $(RepositoryEngineeringDir) variable. --> - + From 641aa9191bae735e4e007495297cd2fa479ff4be Mon Sep 17 00:00:00 2001 From: Keshav Taurah Date: Mon, 19 Oct 2020 22:30:41 -0700 Subject: [PATCH 4/6] Modified relative path --- src/installer/tests/Assets/TestUtils/TestProjects.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index f7a7acc5eefa93..f946fb90b2abdf 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -6,7 +6,7 @@ in a different manner than using the $(RepositoryEngineeringDir) variable. --> - + From 9ce20b08b21527681122d73c58e0d2fe61d5f9dd Mon Sep 17 00:00:00 2001 From: Keshav Taurah Date: Mon, 19 Oct 2020 23:32:40 -0700 Subject: [PATCH 5/6] testing with original path --- src/installer/tests/Assets/TestUtils/TestProjects.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index f946fb90b2abdf..46ff7500357656 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -6,7 +6,7 @@ in a different manner than using the $(RepositoryEngineeringDir) variable. --> - + From ee6fa149b72809c9c800d5581cdf986af47fb20e Mon Sep 17 00:00:00 2001 From: Keshav Taurah Date: Thu, 22 Oct 2020 22:15:54 -0700 Subject: [PATCH 6/6] added correct path for props file --- src/installer/tests/Assets/TestUtils/TestProjects.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index 46ff7500357656..5477665aff1c3e 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -6,7 +6,7 @@ in a different manner than using the $(RepositoryEngineeringDir) variable. --> - +