Skip to content

Commit d9c3d28

Browse files
committed
Revert fx_ver rename and use aspnet namespace
1 parent a064d3e commit d9c3d28

File tree

6 files changed

+370
-363
lines changed

6 files changed

+370
-363
lines changed

AspNetCore.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -7498,8 +7498,8 @@ Global
74987498
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.Build.0 = Debug|x64
74997499
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.ActiveCfg = Debug|ARM64
75007500
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.Build.0 = Debug|ARM64
7501-
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.ActiveCfg = Debug|Any CPU
7502-
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.Build.0 = Debug|Any CPU
7501+
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.ActiveCfg = Debug|x64
7502+
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.Build.0 = Debug|x64
75037503
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.ActiveCfg = Debug|x86
75047504
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.Build.0 = Debug|x86
75057505
{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|Any CPU.ActiveCfg = Release|x64

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ GlobalVersionUtility::GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath
4444

4545
// Throw filesystem_error if directory_iterator can't iterate over the directory
4646
// Throw invalid_argument if any argument is null
47-
std::vector<fx_ver_asp_t>
47+
std::vector<fx_ver_t>
4848
GlobalVersionUtility::GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath)
4949
{
5050
if (pwzAspNetCoreFolderPath == NULL)
5151
{
5252
throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL");
5353
}
5454

55-
std::vector<fx_ver_asp_t> versionsInDirectory;
55+
std::vector<fx_ver_t> versionsInDirectory;
5656
for (auto& p : fs::directory_iterator(pwzAspNetCoreFolderPath))
5757
{
5858
if (!fs::is_directory(p))
5959
{
6060
continue;
6161
}
6262

63-
fx_ver_asp_t requested_ver(-1, -1, -1);
64-
if (fx_ver_asp_t::parse(p.path().filename(), &requested_ver, false))
63+
fx_ver_t requested_ver(-1, -1, -1);
64+
if (fx_ver_t::parse(p.path().filename(), &requested_ver, false))
6565
{
6666
versionsInDirectory.push_back(requested_ver);
6767
}
@@ -79,7 +79,7 @@ GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath)
7979
throw std::invalid_argument("pwzAspNetCoreFolderPath is NULL");
8080
}
8181

82-
std::vector<fx_ver_asp_t> versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath);
82+
std::vector<fx_ver_t> versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath);
8383
if (versionsInDirectory.empty())
8484
{
8585
throw std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder.");

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include "fx_ver.h"
77

8+
using namespace aspnet;
9+
810
class GlobalVersionUtility
911
{
1012
public:
@@ -22,7 +24,7 @@ class GlobalVersionUtility
2224
RemoveFileNameFromFolderPath(std::wstring fileName);
2325

2426
static
25-
std::vector<fx_ver_asp_t>
27+
std::vector<fx_ver_t>
2628
GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath);
2729

2830
static

0 commit comments

Comments
 (0)