Revert "Replace "std::experimental::filesystem" with "std::filesystem" (#1153)"
This reverts commit 2a761d635c.
This commit is contained in:
parent
2a761d635c
commit
d199de2c80
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include "GlobalVersionUtility.h"
|
#include "GlobalVersionUtility.h"
|
||||||
|
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::experimental::filesystem;
|
||||||
|
|
||||||
// throws runtime error if no request handler versions are installed.
|
// throws runtime error if no request handler versions are installed.
|
||||||
// Throw invalid_argument if any argument is null
|
// Throw invalid_argument if any argument is null
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ PollingAppOfflineApplication::AppOfflineExists()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication)
|
std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication)
|
||||||
{
|
{
|
||||||
return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm";
|
return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,8 @@ public:
|
||||||
void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); }
|
void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::filesystem::path m_appOfflineLocation;
|
std::experimental::filesystem::path m_appOfflineLocation;
|
||||||
static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication);
|
static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static const int c_appOfflineRefreshIntervalMS = 200;
|
static const int c_appOfflineRefreshIntervalMS = 200;
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
#include "HandleWrapper.h"
|
#include "HandleWrapper.h"
|
||||||
#include "Environment.h"
|
#include "Environment.h"
|
||||||
|
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::experimental::filesystem;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Runs a standalone appliction.
|
// Runs a standalone appliction.
|
||||||
|
|
@ -98,7 +98,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters(
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL
|
BOOL
|
||||||
HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath)
|
HOSTFXR_UTILITY::IsDotnetExecutable(const std::experimental::filesystem::path & dotnetPath)
|
||||||
{
|
{
|
||||||
auto name = dotnetPath.filename();
|
auto name = dotnetPath.filename();
|
||||||
name.replace_extension("");
|
name.replace_extension("");
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ public:
|
||||||
static
|
static
|
||||||
BOOL
|
BOOL
|
||||||
IsDotnetExecutable(
|
IsDotnetExecutable(
|
||||||
_In_ const std::filesystem::path & dotnetPath
|
_In_ const std::experimental::filesystem::path & dotnetPath
|
||||||
);
|
);
|
||||||
|
|
||||||
static
|
static
|
||||||
|
|
@ -74,25 +74,25 @@ public:
|
||||||
);
|
);
|
||||||
|
|
||||||
static
|
static
|
||||||
std::optional<std::filesystem::path>
|
std::optional<std::experimental::filesystem::path>
|
||||||
GetAbsolutePathToHostFxr(
|
GetAbsolutePathToHostFxr(
|
||||||
_In_ const std::filesystem::path & dotnetPath,
|
_In_ const std::experimental::filesystem::path & dotnetPath,
|
||||||
_In_ HANDLE hEventLog
|
_In_ HANDLE hEventLog
|
||||||
);
|
);
|
||||||
|
|
||||||
static
|
static
|
||||||
std::optional<std::filesystem::path>
|
std::optional<std::experimental::filesystem::path>
|
||||||
GetAbsolutePathToDotnetFromProgramFiles();
|
GetAbsolutePathToDotnetFromProgramFiles();
|
||||||
|
|
||||||
static
|
static
|
||||||
std::optional<std::filesystem::path>
|
std::optional<std::experimental::filesystem::path>
|
||||||
InvokeWhereToFindDotnet();
|
InvokeWhereToFindDotnet();
|
||||||
|
|
||||||
static
|
static
|
||||||
std::optional<std::filesystem::path>
|
std::optional<std::experimental::filesystem::path>
|
||||||
GetAbsolutePathToDotnet(
|
GetAbsolutePathToDotnet(
|
||||||
_In_ const std::filesystem::path & applicationPath,
|
_In_ const std::experimental::filesystem::path & applicationPath,
|
||||||
_In_ const std::filesystem::path & requestedPath
|
_In_ const std::experimental::filesystem::path & requestedPath
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ namespace FileOutManagerStartupTests
|
||||||
wprintf(expected, out);
|
wprintf(expected, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (auto & p : std::filesystem::directory_iterator(tempDirectory.path()))
|
for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory.path()))
|
||||||
{
|
{
|
||||||
std::wstring filename(p.path().filename());
|
std::wstring filename(p.path().filename());
|
||||||
ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix);
|
ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix);
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
namespace GlobalVersionTests
|
namespace GlobalVersionTests
|
||||||
{
|
{
|
||||||
using ::testing::Test;
|
using ::testing::Test;
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::experimental::filesystem;
|
||||||
|
|
||||||
class GlobalVersionTest : public Test
|
class GlobalVersionTest : public Test
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ TempDirectory::TempDirectory()
|
||||||
RPC_CSTR szUuid = NULL;
|
RPC_CSTR szUuid = NULL;
|
||||||
if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK)
|
if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK)
|
||||||
{
|
{
|
||||||
m_path = std::filesystem::temp_directory_path() / reinterpret_cast<PCHAR>(szUuid);
|
m_path = std::experimental::filesystem::temp_directory_path() / szUuid;
|
||||||
RpcStringFreeA(&szUuid);
|
RpcStringFreeA(&szUuid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -37,5 +37,5 @@ TempDirectory::TempDirectory()
|
||||||
|
|
||||||
TempDirectory::~TempDirectory()
|
TempDirectory::~TempDirectory()
|
||||||
{
|
{
|
||||||
std::filesystem::remove_all(m_path);
|
std::experimental::filesystem::remove_all(m_path);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,11 @@ public:
|
||||||
|
|
||||||
~TempDirectory();
|
~TempDirectory();
|
||||||
|
|
||||||
std::filesystem::path path() const
|
std::experimental::filesystem::path path() const
|
||||||
{
|
{
|
||||||
return m_path;
|
return m_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::filesystem::path m_path;
|
std::experimental::filesystem::path m_path;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue