huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add version numbers on aspnetcore.dll and aspnetcorerh.dll, remove unnecessary files (#601)

This commit is contained in:
Justin Kotalik 2018-02-22 10:03:51 -08:00 committed by GitHub
parent a4295aeb5e
commit 4775706bbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 163 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -52,6 +52,7 @@ x64/
src/AspNetCore/aspnetcore_msg.h src/AspNetCore/aspnetcore_msg.h
src/AspNetCore/aspnetcore_msg.rc src/AspNetCore/aspnetcore_msg.rc
src/AspNetCore/version.h src/AspNetCore/version.h
src/RequestHandler/version.h
src/CommonLib/aspnetcore_msg.h src/CommonLib/aspnetcore_msg.h
src/CommonLib/aspnetcore_msg.rc src/CommonLib/aspnetcore_msg.rc
.build .build

6
build/Build.Settings
View File

@ -84,4 +84,10 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<PropertyGroup>
<_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
<_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0'))</_ThreeDigitDayOfYear>
<AssemblyRevision>$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</AssemblyRevision>
</PropertyGroup>
</Project> </Project>

20
src/AspNetCore/AspNetCore.vcxproj
View File

@ -216,24 +216,23 @@
<ClCompile Include="Src\proxymodule.cxx" /> <ClCompile Include="Src\proxymodule.cxx" />
</ItemGroup> </ItemGroup>
<Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild"> <Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<Revision>$(build_number)</Revision>
<Revision Condition="'$(Revision)' == ''">0</Revision>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." /> <VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />
<VersionHeaderContents Include="// Licensed under the MIT License. See LICENSE.txt in the project root for license information." /> <VersionHeaderContents Include="// Licensed under the MIT License. See LICENSE.txt in the project root for license information." />
<VersionHeaderContents Include="%0a" /> <VersionHeaderContents Include="%0a" />
<VersionHeaderContents Include="// This file is auto-generated" /> <VersionHeaderContents Include="// This file is auto-generated" />
<VersionHeaderContents Include="%0a" /> <VersionHeaderContents Include="%0a" />
<VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(Revision)" /> <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
<VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(Revision)\0&quot;" /> <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
<VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(Revision)" /> <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
<VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(Revision)\0&quot;" /> <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
<VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" /> <VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
</ItemGroup> </ItemGroup>
<WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" /> <WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
</Target> </Target>
<ItemGroup>
<FileWrites Include="version.h" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CommonLib\CommonLib.vcxproj"> <ProjectReference Include="..\CommonLib\CommonLib.vcxproj">
<Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project> <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
@ -246,6 +245,9 @@
<ItemGroup> <ItemGroup>
<None Include="Source.def" /> <None Include="Source.def" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="aspnetcoremodule.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="aspnetcore_schema.xml"> <Content Include="aspnetcore_schema.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

61
src/AspNetCore/Inc/bldver.h
View File

@ -1,61 +0,0 @@
//
// this file is automatically generated
// by beaver.exe 1.11.2003.0
//
//
// if you want to use a private version file and customize this, see
// file://samsndrop02/CoreXT-Latest/docs/corext/corext/version.htm
//
#ifndef _BLDVER_H_
#define _BLDVER_H_
#define BUILD_NUMBER "1965.0"
#define BUILD_NUM 1965,0
#define PRODUCT_NUMBER "7.1"
#define PRODUCT_NUM 7,1
#define INET_VERSION "7.1.1965.0"
#define INET_VERSION_L L"7.1.1965.0"
#define INET_VER 7,1,1965,0
#define PRODUCT_MAJOR 7
#define PRODUCT_MAJOR_STRING "7"
#define PRODUCT_MAJOR_NUMBER 7
#define PRODUCT_MINOR 1
#define PRODUCT_MINOR_STRING "1"
#define PRODUCT_MINOR_NUMBER 1
#define BUILD_MAJOR 1965
#define BUILD_MAJOR_STRING "1965"
#define BUILD_MAJOR_NUMBER 1965
#define BUILD_MINOR 0
#define BUILD_MINOR_STRING "0"
#define BUILD_MINOR_NUMBER 0
#define BUILD_PRIVATE "Built by panwang on IIS-OOB.\0"
// beaver.exe can't handle a pragma to disable redefinition
#undef VER_PRODUCTVERSION
#undef VER_PRODUCTVERSION_STR
#undef VER_PRODUCTMAJORVERSION
#undef VER_PRODUCTMINORVERSION
#undef VER_PRODUCTBUILD
#undef VER_PRODUCTBUILD_QFE
#undef VER_PRODUCTNAME_STR
#undef VER_COMPANYNAME_STR
#define VER_PRODUCTVERSION 7,1,1965,0
#define VER_PRODUCTVERSION_STR 7.1.1965.0
#define VER_PRODUCTMAJORVERSION 7
#define VER_PRODUCTMINORVERSION 1
#define VER_PRODUCTBUILD 1965
#define VER_PRODUCTBUILD_QFE 0
#define VER_PRODUCTNAME_STR "Microsoft Web Platform Extensions"
#define VER_COMPANYNAME_STR "Microsoft Corporation"
#endif

25
src/AspNetCore/Inc/resource.h
View File

@ -1,25 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
#pragma once
#define IDS_INVALID_PROPERTY 1000
#define IDS_SERVER_ERROR 1001
// TODO remove this file?
#define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256
#define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG L"Application '%s' started process '%d' successfully and is listening on port '%d'."
#define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG L"Maximum rapid fail count per minute of '%d' exceeded."
#define ASPNETCORE_EVENT_PROCESS_START_INTERNAL_ERROR_MSG L"Application '%s' failed to parse processPath and arguments due to internal error, ErrorCode = '0x%x'."
#define ASPNETCORE_EVENT_PROCESS_START_POSTCREATE_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s'but failed to get its status, ErrorCode = '0x%x'."
#define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s', ErrorCode = '0x%x' processStatus code '%x'."
#define ASPNETCORE_EVENT_PROCESS_START_WRONGPORT_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but failed to listen on the given port '%d'"
#define ASPNETCORE_EVENT_PROCESS_START_NOTREADY_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but either crashed or did not response or did not listen on the given port '%d', ErrorCode = '0x%x'"
#define ASPNETCORE_EVENT_INVALID_STDOUT_LOG_FILE_MSG L"Warning: Could not create stdoutLogFile %s, ErrorCode = %d."
#define ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE_MSG L"Failed to gracefully shutdown process '%d'."
#define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST_MSG L"Sent shutdown HTTP message to process '%d' and received http status '%d'."
#define ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG L"Application '%s' with physical root '%s' failed to load clr and managed application, ErrorCode = '0x%x."
#define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool."
#define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%s' other than the one of running application(s)."
#define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'."
#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread eixt, ErrorCode = '0x%x."

6
src/AspNetCore/aspnetcoremodule.rc
View File

@ -2,7 +2,7 @@
// //
#include <windows.h> #include <windows.h>
#include "version.h" #include "version.h"
#include "resource.h" #include "..\CommonLib\resources.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (United States) resources // English (United States) resources
@ -34,7 +34,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 TEXTINCLUDE 1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" "..\CommonLib\resources.h\0"
END END
2 TEXTINCLUDE 2 TEXTINCLUDE
@ -77,7 +77,7 @@ BEGIN
VALUE "FileDescription", "IIS ASP.NET Core Module" VALUE "FileDescription", "IIS ASP.NET Core Module"
VALUE "FileVersion", FileVersionStr VALUE "FileVersion", FileVersionStr
VALUE "InternalName", "aspnetcore.dll" VALUE "InternalName", "aspnetcore.dll"
VALUE "LegalCopyright", "Copyright (C) 2016" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"
VALUE "OriginalFilename", "aspnetcore.dll" VALUE "OriginalFilename", "aspnetcore.dll"
VALUE "ProductName", "ASP.NET Core Module" VALUE "ProductName", "ASP.NET Core Module"
VALUE "ProductVersion", ProductVersionStr VALUE "ProductVersion", ProductVersionStr

18
src/AspNetCore/resource.h
View File

@ -1,18 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by aspnetcoremodule.rc
//
#define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256
#define IDS_INVALID_PROPERTY 1000
#define IDS_SERVER_ERROR 1001
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

21
src/RequestHandler/RequestHandler.vcxproj
View File

@ -231,6 +231,24 @@
<ClCompile Include="outofprocess\websockethandler.cxx" /> <ClCompile Include="outofprocess\websockethandler.cxx" />
<ClCompile Include="outofprocess\winhttphelper.cxx" /> <ClCompile Include="outofprocess\winhttphelper.cxx" />
</ItemGroup> </ItemGroup>
<Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
<ItemGroup>
<VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />
<VersionHeaderContents Include="// Licensed under the MIT License. See LICENSE.txt in the project root for license information." />
<VersionHeaderContents Include="%0a" />
<VersionHeaderContents Include="// This file is auto-generated" />
<VersionHeaderContents Include="%0a" />
<VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
<VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
<VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
<VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
<VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
</ItemGroup>
<WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
</Target>
<ItemGroup>
<FileWrites Include="version.h" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CommonLib\CommonLib.vcxproj"> <ProjectReference Include="..\CommonLib\CommonLib.vcxproj">
<Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project> <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
@ -239,6 +257,9 @@
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project> <Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="requesthandler.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Source.def" /> <None Include="Source.def" />
</ItemGroup> </ItemGroup>

4
src/RequestHandler/RequestHandler.vcxproj.filters
View File

@ -79,9 +79,7 @@
</ClInclude> </ClInclude>
<ClInclude Include="aspnetcore_event.h" /> <ClInclude Include="aspnetcore_event.h" />
<ClInclude Include="sttimer.h" /> <ClInclude Include="sttimer.h" />
</ItemGroup> <ClInclude Include="disconnectcontext.h" />
<ItemGroup>
<ResourceCompile Include="RequestHandler.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Source.def" /> <None Include="Source.def" />

117
src/RequestHandler/requesthandler.rc Normal file
View File

@ -0,0 +1,117 @@
// Microsoft Visual C++ generated resource script.
//
#include <windows.h>
#include "version.h"
#include "..\CommonLib\resources.h"
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
/////////////////////////////////////////////////////////////////////////////
//
// 11
//
//1 11
//BEGIN
// 0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010,
// 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001,
// 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025,
// 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031,
// 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d,
// 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a,
// 0x0000, 0x0000
//END
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"..\CommonLib\resources.h\0"
END
2 TEXTINCLUDE
BEGIN
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION FileVersion
PRODUCTVERSION ProductVersion
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Microsoft"
VALUE "FileDescription", "IIS ASP.NET Core Module Request Handler"
VALUE "FileVersion", FileVersionStr
VALUE "InternalName", "aspnetcorerh.dll"
VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"
VALUE "OriginalFilename", "aspnetcorerh.dll"
VALUE "ProductName", "ASP.NET Core Module Request Handler"
VALUE "ProductVersion", ProductVersionStr
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE
BEGIN
IDS_INVALID_PROPERTY "Property name '%s' in system.webServer/aspNetCore section has invalid value '%s' which does not conform to the prescribed format"
IDS_SERVER_ERROR "There was a connection error while trying to route the request."
END
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

8
src/RequestHandler/version.h
View File

@ -1,8 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
#define FileVersion 7,1,1987,0
#define FileVersionStr "7.1.1987.0\0"
#define ProductVersion 7,1,1987,0
#define ProductVersionStr "7.1.1987.0\0"
#define PlatformToolset "v141\0"

3
version.props
View File

@ -7,5 +7,8 @@
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber> <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix> <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix> <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<AspNetCoreModuleVersionMajor>8</AspNetCoreModuleVersionMajor>
<AspNetCoreModuleVersionMinor>1</AspNetCoreModuleVersionMinor>
<AspNetCoreModuleVersionPatch>0</AspNetCoreModuleVersionPatch>
</PropertyGroup> </PropertyGroup>
</Project> </Project>