-
Notifications
You must be signed in to change notification settings - Fork 66
Build samples on ci #566
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
twsouthwick
wants to merge
6
commits into
main
Choose a base branch
from
build-samples
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Build samples on ci #566
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9be14a3
Enable building samples on CI
twsouthwick 8adff2a
add targets
twsouthwick b726563
remove e2e samples for now
twsouthwick 8acde98
Revert "remove e2e samples for now"
twsouthwick fb04fab
skip mvc build
twsouthwick 34123e5
handle warn
twsouthwick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <!-- Specify the solutions to build. Add all new solutions/projects here as necessary or the main build won't build them! --> | ||
| <ItemGroup> | ||
| <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))"> | ||
| <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.SystemWebAdapters.sln" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))"> | ||
| <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Microsoft.AspNetCore.SystemWebAdapters.slnf" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
271 changes: 271 additions & 0 deletions
271
samples/targets/WebApplications/Microsoft.WebApplication.targets
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,271 @@ | ||
|
|
||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <IsDesktopBuild Condition="'$(IsDesktopBuild)'=='' And '$(TeamFoundationServerUrl)' != ''">False</IsDesktopBuild> | ||
| <WebProjectOutputDirInsideProjectDefault>True</WebProjectOutputDirInsideProjectDefault> | ||
| <WebProjectOutputDirInsideProjectDefault Condition="('$(OutDir)' != '$(OutputPath)') Or ('$(IsDesktopBuild)' == 'False')" >False</WebProjectOutputDirInsideProjectDefault> | ||
| <WebProjectOutputDirInsideProject Condition="'$(WebProjectOutputDirInsideProject)' == ''">$(WebProjectOutputDirInsideProjectDefault)</WebProjectOutputDirInsideProject> | ||
| <DisableLinkInCopyWebApplicaton Condition="'$(DisableLinkInCopyWebApplicaton)'==''">False</DisableLinkInCopyWebApplicaton> | ||
| <Disable_CopyWebApplication Condition="'$(Disable_CopyWebApplication)' == ''">False</Disable_CopyWebApplication> | ||
| <UseWPP_CopyWebApplication Condition="'$(UseWPP_CopyWebApplication)' == ''">False</UseWPP_CopyWebApplication> | ||
| <CleanWebProjectOutputDir>True</CleanWebProjectOutputDir> | ||
| <CleanWebProjectOutputDir Condition="$(WebProjectOutputDirInsideProject)" >False</CleanWebProjectOutputDir> | ||
| </PropertyGroup> | ||
|
|
||
| <!--Only setup $(WebProjectOutputDir) iff user haven't set it up--> | ||
| <PropertyGroup Condition="'$(WebProjectOutputDir)'==''"> | ||
| <WebProjectOutputDir>$(MSBuildProjectDirectory)</WebProjectOutputDir> | ||
| <WebProjectOutputDir Condition="!$(WebProjectOutputDirInsideProject)">$(OutDir)_PublishedWebsites\$(MSBuildProjectName)</WebProjectOutputDir> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PrepareForRunDependsOn> | ||
| $(PrepareForRunDependsOn); | ||
| _CopyBinDeployableAssemblies; | ||
| </PrepareForRunDependsOn> | ||
| <PrepareForRunDependsOn Condition="!$(Disable_CopyWebApplication)"> | ||
| $(PrepareForRunDependsOn); | ||
| _CopyWebApplication; | ||
| _BuiltWebOutputGroupOutput | ||
| </PrepareForRunDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <!--***************************************************************--> | ||
| <!--Global setting for Clean target --> | ||
| <!--***************************************************************--> | ||
| <PropertyGroup> | ||
| <CleanDependsOn> | ||
| $(CleanDependsOn); | ||
| CleanWebProjectOutputDir; | ||
| </CleanDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <!--********************************************************************--> | ||
| <!-- CleanWebProjectOutputDir --> | ||
| <!-- ********************************************************************--> | ||
| <PropertyGroup> | ||
| <CleanWebProjectOutputDirDependsOn Condition="'$(CleanWebProjectOutputDirDependsOn)' == ''"> | ||
| </CleanWebProjectOutputDirDependsOn> | ||
| </PropertyGroup> | ||
| <Target Name="CleanWebProjectOutputDir" | ||
| Condition="$(CleanWebProjectOutputDir)" | ||
| DependsOnTargets="$(CleanWebProjectOutputDirDependsOn)"> | ||
| <!--Assertion check--> | ||
| <!--In the case of Clean Packaging/Publish, we simply delete the WebProjectOutputDir--> | ||
| <RemoveDir Condition="Exists($(WebProjectOutputDir))" Directories="$(WebProjectOutputDir)" ContinueOnError="true" /> | ||
| </Target> | ||
|
|
||
| <!-- | ||
| ============================================================ | ||
| _CopyWebApplication | ||
|
|
||
| This target will copy the build outputs along with the | ||
| content files into a _PublishedWebsites folder. | ||
|
|
||
| This Task is only necessary when $(OutDir) has been redirected | ||
| to a folder other than ~\bin such as is the case with Team Build. | ||
|
|
||
| The original _CopyWebApplication is now a Legacy, you can still use it by setting $(UseWPP_CopyWebApplication) to true. | ||
| By default, it now change to use _WPPCopyWebApplication target in Microsoft.Web.Publish.targets. It allow to leverage the web.config trsnaformation. | ||
| ============================================================ | ||
| --> | ||
|
|
||
| <PropertyGroup> | ||
| <!--This will be overwrite by ..\web\Microsoft.Web.Publishing.targets when $(UseWPP_CopyWebApplication) set to true--> | ||
| <OnBefore_CopyWebApplicationDefault> | ||
| _CopyWebApplicationLegacy; | ||
| </OnBefore_CopyWebApplicationDefault> | ||
| <OnBefore_CopyWebApplicationDefault Condition="$(UseWPP_CopyWebApplication) AND Exists('$(MSBuildThisFileDirectory)\..\Web\Microsoft.Web.Publishing.targets')"> | ||
| _WPPCopyWebApplication; | ||
| </OnBefore_CopyWebApplicationDefault> | ||
| <OnBefore_CopyWebApplication Condition="'$(OnBefore_CopyWebApplication)'==''"> | ||
| $(OnBefore_CopyWebApplicationDefault); | ||
| </OnBefore_CopyWebApplication> | ||
|
|
||
| <OnAfter_CopyWebApplication Condition="'$(OnAfter_CopyWebApplication)'==''"> | ||
| </OnAfter_CopyWebApplication> | ||
|
|
||
| <_CopyWebApplicationDependsOn Condition="'$(_CopyWebApplicationDependsOn)'==''"> | ||
| $(OnBefore_CopyWebApplication); | ||
| </_CopyWebApplicationDependsOn> | ||
|
|
||
| </PropertyGroup> | ||
| <Target Name="_CopyWebApplication" | ||
| Condition="!$(Disable_CopyWebApplication) And !$(WebProjectOutputDirInsideProject)" | ||
| DependsOnTargets="$(_CopyWebApplicationDependsOn)"> | ||
|
|
||
| <CallTarget Condition="'$(OnAfter_CopyWebApplication)' != ''" Targets="$(OnAfter_CopyWebApplication)" RunEachTargetSeparately="true" /> | ||
|
|
||
| </Target> | ||
|
|
||
| <!-- | ||
| ============================================================ | ||
| _CopyWebApplicationLegacy | ||
|
|
||
| This target will copy the build outputs along with the | ||
| content files into a _PublishedWebsites folder. | ||
|
|
||
| This Task is only necessary when $(OutDir) has been redirected | ||
| to a folder other than ~\bin such as is the case with Team Build. | ||
| ============================================================ | ||
| --> | ||
| <Target Name="_CopyWebApplicationLegacy" Condition="!$(Disable_CopyWebApplication) And !$(WebProjectOutputDirInsideProject)" > | ||
| <!-- Log tasks --> | ||
| <Message Text="Copying Web Application Project Files for $(MSBuildProjectName)" /> | ||
|
|
||
| <!-- Create the _PublishedWebsites\app\bin folder --> | ||
| <MakeDir Directories="$(WebProjectOutputDir)\bin" /> | ||
|
|
||
| <!-- Copy build outputs to _PublishedWebsites\app\bin folder --> | ||
| <Copy SourceFiles="@(IntermediateAssembly)" DestinationFolder="$(WebProjectOutputDir)\bin" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="@(AddModules)" | ||
| DestinationFolder="$(WebProjectOutputDir)\bin" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="$(IntermediateOutputPath)$(_SGenDllName)" | ||
| DestinationFolder="$(WebProjectOutputDir)\%(Content.SubFolder)%(Content.RecursiveDir)" | ||
| SkipUnchangedFiles="true" | ||
| Condition="'$(_SGenDllCreated)'=='true'" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="$(IntermediateOutputPath)$(TargetName).pdb" | ||
| DestinationFolder="$(WebProjectOutputDir)\bin" | ||
| SkipUnchangedFiles="true" | ||
| Condition="'$(_DebugSymbolsProduced)'=='true'" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="@(DocFileItem)" | ||
| DestinationFolder="$(WebProjectOutputDir)\bin" | ||
| SkipUnchangedFiles="true" | ||
| Condition="'$(_DocumentationFileProduced)'=='true'" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="@(IntermediateSatelliteAssembliesWithTargetPath)" | ||
| DestinationFiles="@(IntermediateSatelliteAssembliesWithTargetPath->'$(WebProjectOutputDir)\bin\%(Culture)\$(TargetName).resources.dll')" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="@(ReferenceComWrappersToCopyLocal); @(ResolvedIsolatedComModules); @(_DeploymentLooseManifestFile); @(NativeReferenceFile)" | ||
| DestinationFolder="$(WebProjectOutputDir)\bin" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
|
|
||
| <!-- copy any referenced assemblies to _PublishedWebsites\app\bin folder --> | ||
| <Copy SourceFiles="@(ReferenceCopyLocalPaths)" | ||
| DestinationFiles="@(ReferenceCopyLocalPaths->'$(WebProjectOutputDir)\bin\%(DestinationSubDirectory)%(Filename)%(Extension)')" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
|
|
||
| <!-- Copy content files recursively to _PublishedWebsites\app\ folder --> | ||
| <Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' == ''" | ||
| DestinationFiles="@(Content -> '$(WebProjectOutputDir)\%(RelativeDir)\%(FileName)%(Extension)')" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)" /> | ||
| <Copy SourceFiles="@(Content)" Condition="!$(DisableLinkInCopyWebApplicaton) And '%(Content.Link)' != ''" | ||
| DestinationFiles="@(Content -> '$(WebProjectOutputDir)\%(Link)')" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
|
|
||
| <!-- Copy items that have been marked to be copied to the bin folder --> | ||
| <Copy SourceFiles="@(_SourceItemsToCopyToOutputDirectory)" | ||
| DestinationFiles="@(_SourceItemsToCopyToOutputDirectory-> '$(WebProjectOutputDir)\bin\%(TargetPath)')" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
| <Copy SourceFiles="@(_SourceItemsToCopyToOutputDirectoryAlways)" | ||
| DestinationFiles="@(_SourceItemsToCopyToOutputDirectoryAlways-> '$(WebProjectOutputDir)\bin\%(TargetPath)')" | ||
| SkipUnchangedFiles="false" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
|
|
||
| <!-- Copy items that need to be bin deployed to the bin folder --> | ||
| <Copy SourceFiles="@(_binDeployableAssemblies)" | ||
| DestinationFolder="$(WebProjectOutputDir)\bin\%(_binDeployableAssemblies.DestinationRelPath)" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
|
|
||
| </Target> | ||
|
|
||
| <!-- | ||
| ============================================================ | ||
| _BuiltWebOutputGroupOutput | ||
|
|
||
| This target creates and populates BuiltWebOutputGroupOutput | ||
| with contents of bin along with the @(Content) files | ||
| ============================================================ | ||
| --> | ||
| <Target Name ="_BuiltWebOutputGroupOutput" | ||
| Condition="!$(Disable_CopyWebApplication)" | ||
| Outputs="@(BuiltWebOutputGroupOutput)"> | ||
| <CreateItem Include="$(WebProjectOutputDir)\bin\**\*.*;@(Content->'%(FullPath)')" Condition="'$(OutDir)' == '$(OutputPath)'"> | ||
| <Output ItemName="BuiltWebOutputGroupOutput" TaskParameter="Include"/> | ||
| </CreateItem> | ||
|
|
||
| <CreateItem Include="$(WebProjectOutputDir)\**\*.*" Condition="'$(OutDir)' != '$(OutputPath)'"> | ||
| <Output ItemName="BuiltWebOutputGroupOutput" TaskParameter="Include"/> | ||
| </CreateItem> | ||
| </Target> | ||
|
|
||
| <!-- | ||
| ============================================================ | ||
| _CopyBinDeployableAssemblies | ||
|
|
||
| This target copies the contents of ProjectDir\_bin_deployableAssemblies to the bin | ||
| folder, preserving the relative paths | ||
| ============================================================ | ||
| --> | ||
| <Target | ||
| Name="_CopyBinDeployableAssemblies" | ||
| Condition="Exists('$(MSBuildProjectDirectory)\_bin_deployableAssemblies')"> | ||
|
|
||
| <PropertyGroup> | ||
| <BinDeployableFolder Condition="'$(BinDeployableFolder)' == ''">_bin_deployableAssemblies\</BinDeployableFolder> | ||
| <BinDeployableFolderFullPath>$([System.IO.Path]::GetFullPath($(BinDeployableFolder)))</BinDeployableFolderFullPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!--Pick up the deployable items from the $(None) collection that are under the _bin_deployableAssemblies folder --> | ||
| <CreateItem Include="@(None->'%(Identity)')" Condition="'%(None.FullPath)' != '' And $([System.String]::new('%(None.FullPath)').StartsWith($(BinDeployableFolderFullPath), StringComparison.OrdinalIgnoreCase ))" > | ||
| <Output ItemName="__binDeployableAssemblies" TaskParameter="Include"/> | ||
| </CreateItem> | ||
|
|
||
| <!--Add metadata which holds the destination relative folder to copy them to--> | ||
| <ItemGroup> | ||
| <_binDeployableAssemblies Include ="@(__binDeployableAssemblies)" Condition="'@(__binDeployableAssemblies)' != ''"> | ||
| <DestinationRelPath>$([System.String]::Concat($([System.IO.Path]::GetDirectoryName($([System.String]::new('%(__binDeployableAssemblies.FullPath)')))),'\').SubString($(BinDeployableFolderFullPath.Length)))</DestinationRelPath> | ||
| </_binDeployableAssemblies> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Do the copy--> | ||
| <Copy SourceFiles="@(_binDeployableAssemblies)" DestinationFolder="$(OutDir)%(_binDeployableAssemblies.DestinationRelPath)" | ||
| SkipUnchangedFiles="true" | ||
| Retries="$(CopyRetryCount)" | ||
| RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"/> | ||
|
|
||
| <!--Add the items just copied to the collection of items to delete when doing a clean--> | ||
| <ItemGroup> | ||
| <FileWrites Include ="@(_binDeployableAssemblies->'$(OutDir)%(DestinationRelPath)%(Filename)%(Extension)')" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <!--Import publishing target--> | ||
| <PropertyGroup> | ||
| <AspNetTargetsPath Condition=" '$(AspNetTargetsPath)'=='' ">$(MSBuildThisFileDirectory)..\Web\</AspNetTargetsPath> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(AspNetTargetsPath)Microsoft.Web.Publishing.targets" Condition="Exists('$(AspNetTargetsPath)Microsoft.Web.Publishing.targets')" /> | ||
|
|
||
| <!-- Instruct ResolveAssemblyReferences in MS.Common.targets to generate suggested binding redirects. --> | ||
| <PropertyGroup> | ||
| <AutoUnifyAssemblyReferences>false</AutoUnifyAssemblyReferences> | ||
| <AppConfig Condition="'$(AppConfig)' == '' And Exists('$(ProjectConfigFileName)')">$(ProjectConfigFileName)</AppConfig> | ||
| </PropertyGroup> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@joperezr this is a targets file that is normally shipped with VS and the only blocker now for building the samples on CI. I do not know its license. Do you know how we can figure out if it's something we can distribute? If so, I'd want to push it upstream to the MSBuild.SDK.SystemWeb project after we get things working here.