microsoft
/
IIS.Administration
зеркало из https://github.com/microsoft/IIS.Administration.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

.NET Core 2.2 compiled and run

This commit is contained in:
Peter Hsu 2019-03-06 12:20:33 -08:00
Родитель 9d274672c3
Коммит 2bb39d3c4c
38 изменённых файлов: 152 добавлений и 209 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
build/version.props
Просмотреть файл

@ -2,5 +2,26 @@
<PropertyGroup>
<IISAdministrationVersion>2.2.1</IISAdministrationVersion>
<MicroBuildCoreVersion>0.3.0</MicroBuildCoreVersion>
<SystemSecurityCryptographyX509CertificatesVersion>4.3.2</SystemSecurityCryptographyX509CertificatesVersion>
<SerilogExtensionsLoggingVersion>2.0.2</SerilogExtensionsLoggingVersion>
<SerilogVersion>2.7.1</SerilogVersion>
<SerilogSinksRollingFileVersion>3.3.0</SerilogSinksRollingFileVersion>
<MicrosoftAspNetCoreMvcVersion>2.1.3</MicrosoftAspNetCoreMvcVersion>
<MicrosoftAspNetCoreAuthorizationVersion>2.1.2</MicrosoftAspNetCoreAuthorizationVersion>
<MicrosoftAspNetCoreMvcWebApiCompatShimVersion>2.1.3</MicrosoftAspNetCoreMvcWebApiCompatShimVersion>
<MicrosoftAspNetCoreStaticFilesVersion>2.1.1</MicrosoftAspNetCoreStaticFilesVersion>
<MicrosoftExtensionsConfigurationBinderVersion>2.1.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftWebAdministrationVersion>11.1.0</MicrosoftWebAdministrationVersion>
<SystemCollectionsNonGenericVersion>4.3.0</SystemCollectionsNonGenericVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.3.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
<SystemNetNetworkInformationVersion>4.3.0</SystemNetNetworkInformationVersion>
<SystemSecurityCryptographyCspVersion>4.3.0</SystemSecurityCryptographyCspVersion>
<SystemServiceProcessServiceControllerVersion>4.5.0</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETestSdkVersion>15.9.0</MicrosoftNETestSdkVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.1</XUnitRunnerVisualStudioVersion>
</PropertyGroup>
</Project>
</Project>

6
src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.csproj
Просмотреть файл

@ -16,11 +16,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="$(SystemSecurityCryptographyX509CertificatesVersion)" />
</ItemGroup>
</Project>

22
src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.csproj
Просмотреть файл

@ -12,18 +12,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Serilog" Version="2.7.1" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsLoggingVersion)" />
<PackageReference Include="Serilog" Version="$(SerilogVersion)" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="$(SerilogSinksRollingFileVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftAspNetCoreAuthorizationVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="$(MicrosoftAspNetCoreMvcWebApiCompatShimVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="$(SystemDiagnosticsFileVersionInfoVersion)" />
</ItemGroup>
</Project>

6
src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.csproj
Просмотреть файл

@ -16,11 +16,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesVersion)" />
</ItemGroup>
</Project>

6
src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj
Просмотреть файл

@ -17,11 +17,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Security.Cryptography.Csp" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.Csp" Version="$(SystemSecurityCryptographyCspVersion)" />
</ItemGroup>
</Project>

6
src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.csproj
Просмотреть файл

@ -16,11 +16,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
<PackageReference Include="System.Collections.NonGeneric" Version="$(SystemCollectionsNonGenericVersion)" />
</ItemGroup>
</Project>

10
src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.csproj
Просмотреть файл

@ -16,12 +16,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="$(SystemDiagnosticsFileVersionInfoVersion)" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
</ItemGroup>
</Project>

6
src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.csproj
Просмотреть файл

@ -16,11 +16,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
</ItemGroup>
</Project>

6
src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.csproj
Просмотреть файл

@ -10,9 +10,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.UrlRewrite/Microsoft.IIS.Administration.WebServer.UrlRewrite.csproj
Просмотреть файл

@ -10,9 +10,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

6
src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj
Просмотреть файл

@ -12,9 +12,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj
Просмотреть файл

@ -16,11 +16,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
</ItemGroup>
</Project>

10
src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.csproj
Просмотреть файл

@ -17,12 +17,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Web.Administration" Version="11.1.0" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
<PackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
</ItemGroup>
</Project>

4
src/Microsoft.IIS.Administration/Extensibility/ModuleLoader.cs
Просмотреть файл

@ -16,7 +16,6 @@ namespace Microsoft.IIS.Administration
class ModuleLoader
{
private IHostingEnvironment _env;
private AssemblyLoadContext _loader;
private List<Assembly> _loadedAssemblies;
private AdminHost _moduleHolder;
private string _moduleLoadBasePath;
@ -29,7 +28,6 @@ namespace Microsoft.IIS.Administration
this._moduleLoadBasePath = Path.Combine(env.ContentRootPath, PLUGINS_FOLDER_NAME);
this._loadedAssemblies = new List<Assembly>();
this._moduleHolder = AdminHost.Instance;
this._loader = new PluginAssemblyLoadContext(_moduleLoadBasePath);
}
public Assembly LoadModule(string assemblyName)
@ -38,7 +36,7 @@ namespace Microsoft.IIS.Administration
Log.Logger.Debug($"Loading plugin {assemblyName}");
Assembly assembly = _loader.LoadFromAssemblyPath(assemblyPath);
var assembly = Assembly.LoadFrom(assemblyPath);
_loadedAssemblies.Add(assembly);

76
src/Microsoft.IIS.Administration/Extensibility/PluginAssemblyLoadContext.cs
Просмотреть файл

@ -1,76 +0,0 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace Microsoft.IIS.Administration
{
using Serilog;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
// Implemented for https://github.com/dotnet/coreclr/issues/5837
// Can move back to resolver callback when fixed
public class PluginAssemblyLoadContext : AssemblyLoadContext
{
private string _pluginDir;
public PluginAssemblyLoadContext(string pluginDirectory)
{
this._pluginDir = pluginDirectory;
}
protected override Assembly Load(AssemblyName assemblyName)
{
AssemblyName loaded = Assembly.GetEntryAssembly().GetReferencedAssemblies().FirstOrDefault(a => a.Name.Equals(assemblyName.Name));
if (loaded != null)
{
return Assembly.Load(loaded);
}
Assembly asm = null;
IList<string> rootPaths = new List<string>();
rootPaths.Add(Path.Combine(this._pluginDir, $"{assemblyName.Name}.{assemblyName.Version}"));
rootPaths.Add(this._pluginDir);
foreach (var path in rootPaths) {
string asmPath = Path.Combine(path, $"{assemblyName.Name}.dll");
Log.Logger.Debug($"Resolving plugin dependency {assemblyName} using location {asmPath}");
if (File.Exists(asmPath)) {
// If LoadFromAssemblyPath's argument does not point to a valid assembly a fatal error will occur that will not throw an exception
// The process will terminate ungracefully
asm = this.LoadFromAssemblyPath(asmPath);
}
}
// Possible runtime assembly
if (asm == null) {
string winRuntime = null;
string runtimes = Path.Combine(this._pluginDir, "runtimes");
if (Directory.Exists(runtimes)) {
winRuntime = Directory.GetDirectories(runtimes).FirstOrDefault(d => d.ToLower().Contains("win"));
}
if (winRuntime != null) {
foreach (var file in Directory.GetFiles(winRuntime, "*.dll", SearchOption.AllDirectories)) {
if (Path.GetFileName(file) == assemblyName.Name + ".dll") {
asm = this.LoadFromAssemblyPath(file);
break;
}
}
}
}
return asm;
}
}
}

8
src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.csproj
Просмотреть файл

@ -4,7 +4,7 @@
<PropertyGroup>
<VersionPrefix>$(IISAdministrationVersion)</VersionPrefix>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>Microsoft.IIS.Administration</AssemblyName>
<OutputType>Exe</OutputType>
@ -34,9 +34,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />

16
test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.csproj
Просмотреть файл

@ -4,7 +4,7 @@
<Description>Tests Class Library</Description>
<VersionPrefix>$(IISAdministrationVersion)</VersionPrefix>
<Authors>Microsoft</Authors>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>Microsoft.IIS.Administration.Tests</AssemblyName>
<PackageId>Microsoft.IIS.Administration.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@ -23,14 +23,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETestSdkVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="System.Net.NetworkInformation" Version="$(SystemNetNetworkInformationVersion)" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
</ItemGroup>
<ItemGroup>