Skip to content

Commit a63e2bf

Browse files
pakrympakrym
authored
Fix site extension building (#135)
1 parent 6b7bf32 commit a63e2bf

File tree

5 files changed

+40
-31
lines changed

5 files changed

+40
-31
lines changed

‎build/dependencies.props

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15651</InternalAspNetCoreSdkPackageVersion>
7-
<InternalAspNetCoreSiteExtensionSdkPackageVersion>2.1.0-preview1-15651</InternalAspNetCoreSiteExtensionSdkPackageVersion>
6+
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15675</InternalAspNetCoreSdkPackageVersion>
7+
<InternalAspNetCoreSiteExtensionSdkPackageVersion>2.1.0-preview1-15671</InternalAspNetCoreSiteExtensionSdkPackageVersion>
88
<MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion>
9-
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
9+
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
1010
<MicrosoftAspNetCoreAzureAppServicesHostingStartupVersion>2.1.0-preview1-27855</MicrosoftAspNetCoreAzureAppServicesHostingStartupVersion>
1111
<MicrosoftAspNetCoreAzureKeyVaultHostingStartupVersion>2.1.0-preview1-27855</MicrosoftAspNetCoreAzureKeyVaultHostingStartupVersion>
12-
<MicrosoftAspNetCoreDataProtectionAzureKeyVaultPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreDataProtectionAzureKeyVaultPackageVersion>
13-
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
14-
<MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreHostingPackageVersion>
15-
<MicrosoftAspNetCoreIdentityServiceAzureKeyVaultPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreIdentityServiceAzureKeyVaultPackageVersion>
16-
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreMvcPackageVersion>
17-
<MicrosoftAspNetCoreRazorRuntimePackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreRazorRuntimePackageVersion>
18-
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
19-
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.0-preview1-27965</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
20-
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreServerKestrelPackageVersion>
21-
<MicrosoftAspNetCoreTestHostPackageVersion>2.1.0-preview1-27965</MicrosoftAspNetCoreTestHostPackageVersion>
12+
<MicrosoftAspNetCoreDataProtectionAzureKeyVaultPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreDataProtectionAzureKeyVaultPackageVersion>
13+
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
14+
<MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreHostingPackageVersion>
15+
<MicrosoftAspNetCoreIdentityServiceAzureKeyVaultPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreIdentityServiceAzureKeyVaultPackageVersion>
16+
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreMvcPackageVersion>
17+
<MicrosoftAspNetCoreRazorRuntimePackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreRazorRuntimePackageVersion>
18+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
19+
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.0-preview1-28103</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
20+
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreServerKestrelPackageVersion>
21+
<MicrosoftAspNetCoreTestHostPackageVersion>2.1.0-preview1-28103</MicrosoftAspNetCoreTestHostPackageVersion>
2222
<MicrosoftAzureManagementFluentPackageVersion>1.1.3</MicrosoftAzureManagementFluentPackageVersion>
23-
<MicrosoftAzureServicesAppAuthenticationPackageVersion>1.0.0-preview</MicrosoftAzureServicesAppAuthenticationPackageVersion>
24-
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
25-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
26-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
27-
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsConfigurationJsonPackageVersion>
28-
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
29-
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
30-
<MicrosoftExtensionsLoggingConfigurationPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsLoggingConfigurationPackageVersion>
31-
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsLoggingConsolePackageVersion>
32-
<MicrosoftExtensionsLoggingPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsLoggingPackageVersion>
33-
<MicrosoftExtensionsLoggingTestingPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsLoggingTestingPackageVersion>
34-
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsProcessSourcesPackageVersion>
23+
<MicrosoftAzureServicesAppAuthenticationPackageVersion>1.1.0-preview</MicrosoftAzureServicesAppAuthenticationPackageVersion>
24+
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
25+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
26+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
27+
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsConfigurationJsonPackageVersion>
28+
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
29+
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
30+
<MicrosoftExtensionsLoggingConfigurationPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsLoggingConfigurationPackageVersion>
31+
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsLoggingConsolePackageVersion>
32+
<MicrosoftExtensionsLoggingPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsLoggingPackageVersion>
33+
<MicrosoftExtensionsLoggingTestingPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsLoggingTestingPackageVersion>
34+
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-preview1-28103</MicrosoftExtensionsProcessSourcesPackageVersion>
3535
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
36-
<MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26016-05</MicrosoftNETCoreApp21PackageVersion>
36+
<MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26115-03</MicrosoftNETCoreApp21PackageVersion>
3737
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
3838
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
3939
<MoqPackageVersion>4.7.49</MoqPackageVersion>
4040
<NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
41-
<SystemReflectionMetadataPackageVersion>1.6.0-preview1-25914-04</SystemReflectionMetadataPackageVersion>
41+
<SystemReflectionMetadataPackageVersion>1.6.0-preview1-26112-01</SystemReflectionMetadataPackageVersion>
4242
<WindowsAzureStoragePackageVersion>8.1.4</WindowsAzureStoragePackageVersion>
4343
<XunitPackageVersion>2.3.1</XunitPackageVersion>
4444
<XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>

‎build/repo.targets

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.NETCore.App\'))"
4848
Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreApp21PackageVersion)" />
4949

50+
<_CleanupFiles
51+
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.All\'))"
52+
Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.All\$(PackageVersion)" />
53+
5054
<_CleanupFiles
5155
Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)host\fxr'))"
5256
Exclude="$(SiteExtensionWorkingDirectory)host\fxr\$(MicrosoftNETCoreApp21PackageVersion)" />
@@ -59,7 +63,8 @@
5963
<Message Text="Removing %(_CleanupFiles.Identity)" Importance="High" />
6064
<RemoveDir Directories="@(_CleanupFiles)" />
6165

62-
<Copy SourceFiles="$(ArtifactDependencyLocation)\%(BundledTemplate.Identity).%(Version).nupkg" DestinationFolder="$(SiteExtensionWorkingDirectory)\sdk\$(_SdkVersion)\Templates" />
66+
<!-- Workaround for nuget filtering out .nupkg files by default -->
67+
<Copy SourceFiles="$(ArtifactDependencyLocation)\%(BundledTemplate.Identity).%(Version).nupkg" DestinationFiles="$(SiteExtensionWorkingDirectory)\sdk\$(_SdkVersion)\Templates\%(BundledTemplate.Identity).%(Version).nupkg_" />
6368
<Copy SourceFiles="$(ArtifactDependencyLocation)\nuGetPackagesArchive-$(PackageVersion).lzma" DestinationFiles="$(SiteExtensionWorkingDirectory)\sdk\$(_SdkVersion)\nuGetPackagesArchive.lzma" />
6469

6570
<UnzipArchive File="$(ArtifactDependencyLocation)\aspnetcore-runtime-internal-$(PackageVersion)-win-x86.zip" Destination="$(SiteExtensionWorkingDirectory)" Overwrite="true" />

‎extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ SET DOTNET=D:\Program Files (x86)\dotnet
22
SET DOTNETCACHE=D:\DotNetCache
33
SET RUNTIMES=%DOTNET%\shared\Microsoft.NETCore.App
44

5+
for /R %%x in (*.nupkg_) do ren "%%x" "*.nupkg"
6+
57
robocopy "%DOTNET%" "." /E /XC /XN /XO /NFL /NDL ^
68
/XD "%DOTNET%\sdk" ^
79
/XD "%RUNTIMES%\1.0.3" ^

‎extensions/Microsoft.AspNetCore.Runtime.SiteExtension/install.cmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
SET DOTNET=D:\Program Files (x86)\dotnet
22

3-
dotnet msbuild /version
3+
for /R %%x in (*.nupkg_) do ren "%%x" "*.nupkg"
4+
5+
dotnet msbuild /version

‎korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.0-preview1-15661
2-
commithash:c9349d4c8a495d3085d9b879214d80f2f45e2193
1+
version:2.1.0-preview1-15675
2+
commithash:2ae69024f0d302f71128d9d0f1aeb99f199be47a

0 commit comments

Comments
 (0)