Skip to content

Commit

Permalink
Fix UpdateSamplesOutput.bat to use the net5 binaries. Ran it too, to …
Browse files Browse the repository at this point in the history 
…update generated "reference" folders.
  • Loading branch information
@sylvain-audi
sylvain-audi committed Jan 13, 2022
1 parent e4d30aa commit 016ec11
Show file tree
Hide file tree
Showing 11 changed files with 119 additions and 137 deletions.
64 changes: 32 additions & 32 deletions ...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_


//=================================================================================================================
Copy( 'Copy_CDABBD29' )
Copy( 'Copy_7C29BD29' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe'
Expand All @@ -152,7 +152,7 @@ Copy( 'Copy_CDABBD29' )


//=================================================================================================================
Copy( 'Copy_6D45C9ED' )
Copy( 'Copy_1BC3C9ED' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb'
Expand All @@ -161,16 +161,16 @@ Copy( 'Copy_6D45C9ED' )


//=================================================================================================================
CopyDir( 'Copy_043B3282' )
CopyDir( 'Copy_D8B93282' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\'
.SourcePathsPattern = '*.*'
.SourcePathsRecurse = true
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\file_copy_destination\'
.PreBuildDependencies = {
'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_CDABBD29',
'Copy_6D45C9ED'
'Copy_7C29BD29',
'Copy_1BC3C9ED'
}
}

Expand All @@ -179,9 +179,9 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64' )
{
.Targets = {
'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_CDABBD29',
'Copy_6D45C9ED',
'Copy_043B3282'
'Copy_7C29BD29',
'Copy_1BC3C9ED',
'Copy_D8B93282'
}
}

Expand Down Expand Up @@ -318,7 +318,7 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6


//=================================================================================================================
Copy( 'Copy_EBDB2349' )
Copy( 'Copy_31D92349' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe'
Expand All @@ -327,7 +327,7 @@ Copy( 'Copy_EBDB2349' )


//=================================================================================================================
Copy( 'Copy_FF2A720D' )
Copy( 'Copy_4528720D' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb'
Expand All @@ -336,16 +336,16 @@ Copy( 'Copy_FF2A720D' )


//=================================================================================================================
CopyDir( 'Copy_81DF5222' )
CopyDir( 'Copy_6DDD5222' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\'
.SourcePathsPattern = '*.*'
.SourcePathsRecurse = true
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\file_copy_destination\'
.PreBuildDependencies = {
'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_EBDB2349',
'Copy_FF2A720D'
'Copy_31D92349',
'Copy_4528720D'
}
}

Expand All @@ -354,9 +354,9 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64' )
{
.Targets = {
'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_EBDB2349',
'Copy_FF2A720D',
'Copy_81DF5222'
'Copy_31D92349',
'Copy_4528720D',
'Copy_6DDD5222'
}
}

Expand Down Expand Up @@ -492,7 +492,7 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executa


//=================================================================================================================
Copy( 'Copy_F64F55D5' )
Copy( 'Copy_168D55D5' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe'
Expand All @@ -501,7 +501,7 @@ Copy( 'Copy_F64F55D5' )


//=================================================================================================================
Copy( 'Copy_D9CBE015' )
Copy( 'Copy_FA09E015' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb'
Expand All @@ -510,16 +510,16 @@ Copy( 'Copy_D9CBE015' )


//=================================================================================================================
CopyDir( 'Copy_7A6FA5CA' )
CopyDir( 'Copy_80ADA5CA' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\'
.SourcePathsPattern = '*.*'
.SourcePathsRecurse = true
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\file_copy_destination\'
.PreBuildDependencies = {
'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable',
'Copy_F64F55D5',
'Copy_D9CBE015'
'Copy_168D55D5',
'Copy_FA09E015'
}
}

Expand All @@ -528,9 +528,9 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64' )
{
.Targets = {
'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable',
'Copy_F64F55D5',
'Copy_D9CBE015',
'Copy_7A6FA5CA'
'Copy_168D55D5',
'Copy_FA09E015',
'Copy_80ADA5CA'
}
}

Expand Down Expand Up @@ -667,7 +667,7 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Execu


//=================================================================================================================
Copy( 'Copy_A82D2B75' )
Copy( 'Copy_CFEB2B75' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe'
Expand All @@ -676,7 +676,7 @@ Copy( 'Copy_A82D2B75' )


//=================================================================================================================
Copy( 'Copy_F2DE4EF5' )
Copy( 'Copy_1A9C4EF5' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb'
Expand All @@ -685,16 +685,16 @@ Copy( 'Copy_F2DE4EF5' )


//=================================================================================================================
CopyDir( 'Copy_7608D0EA' )
CopyDir( 'Copy_03C6D0EA' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\'
.SourcePathsPattern = '*.*'
.SourcePathsRecurse = true
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\file_copy_destination\'
.PreBuildDependencies = {
'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable',
'Copy_A82D2B75',
'Copy_F2DE4EF5'
'Copy_CFEB2B75',
'Copy_1A9C4EF5'
}
}

Expand All @@ -703,9 +703,9 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64' )
{
.Targets = {
'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable',
'Copy_A82D2B75',
'Copy_F2DE4EF5',
'Copy_7608D0EA'
'Copy_CFEB2B75',
'Copy_1A9C4EF5',
'Copy_03C6D0EA'
}
}

Expand Down
18 changes: 0 additions & 18 deletions ...ke.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExplicitlyOrderedPostBuildTest", "explicitlyorderedpostbuildtest_vs2019_win64.vcxproj", "{E965FD55-C022-64FC-AB1B-9C299D53E107}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastBuildFunctionalTest_All", "fastbuildfunctionaltest_all.vcxproj", "{6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}"
ProjectSection(ProjectDependencies) = postProject
{09B70182-6E14-896B-E2DF-B4874B8125B1} = {09B70182-6E14-896B-E2DF-B4874B8125B1}
{2093F67D-893F-9F48-CE9C-D33ABE1E2BFF} = {2093F67D-893F-9F48-CE9C-D33ABE1E2BFF}
{3B88798D-8E0B-330F-7C31-7F761D686B03} = {3B88798D-8E0B-330F-7C31-7F761D686B03}
{42927944-97F0-ACD6-0787-AB607A15027F} = {42927944-97F0-ACD6-0787-AB607A15027F}
{4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035} = {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}
{6644576B-DABD-B111-1BB5-47804F5CE2DC} = {6644576B-DABD-B111-1BB5-47804F5CE2DC}
{66831DE7-5D2E-C368-ABD4-4F45E76AAFF3} = {66831DE7-5D2E-C368-ABD4-4F45E76AAFF3}
{6C284AF9-4231-78AB-754D-A7143C2B81DD} = {6C284AF9-4231-78AB-754D-A7143C2B81DD}
{8DF6E677-91F0-4434-28CE-36FEC6B2B858} = {8DF6E677-91F0-4434-28CE-36FEC6B2B858}
{907F7CFF-3D45-EE04-7085-E9E2DB067942} = {907F7CFF-3D45-EE04-7085-E9E2DB067942}
{9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5} = {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}
{BC3341AC-FE51-B984-2CC3-805586205CBC} = {BC3341AC-FE51-B984-2CC3-805586205CBC}
{C987AAB6-A816-E538-96F5-B2B11C90C207} = {C987AAB6-A816-E538-96F5-B2B11C90C207}
{D4A0C206-AA95-4DD7-C15C-ACEF32DF514E} = {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}
{D6CD0AF8-4246-8B90-F4CC-FFEED89FA8C7} = {D6CD0AF8-4246-8B90-F4CC-FFEED89FA8C7}
{E965FD55-C022-64FC-AB1B-9C299D53E107} = {E965FD55-C022-64FC-AB1B-9C299D53E107}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MixCppAndCExe", "mixcppandcexe_vs2019_win64.vcxproj", "{C987AAB6-A816-E538-96F5-B2B11C90C207}"
EndProject
Expand Down
16 changes: 8 additions & 8 deletions ...nalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable


//=================================================================================================================
CopyDir( 'Copy_0856A229' )
CopyDir( 'Copy_FC14A229' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\'
.SourcePathsPattern = { '*.cpp', '*.txt' }
Expand All @@ -157,7 +157,7 @@ Alias( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64' )
{
.Targets = {
'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_0856A229'
'Copy_FC14A229'
}
}

Expand Down Expand Up @@ -294,7 +294,7 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_Executab


//=================================================================================================================
CopyDir( 'Copy_D0BF3DD9' )
CopyDir( 'Copy_3C3D3DD9' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\'
.SourcePathsPattern = { '*.cpp', '*.txt' }
Expand All @@ -308,7 +308,7 @@ Alias( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64' )
{
.Targets = {
'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_D0BF3DD9'
'Copy_3C3D3DD9'
}
}

Expand Down Expand Up @@ -444,7 +444,7 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_Executable' )


//=================================================================================================================
CopyDir( 'Copy_FA589A94' )
CopyDir( 'Copy_13B69A94' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\'
.SourcePathsPattern = { '*.cpp', '*.txt' }
Expand All @@ -458,7 +458,7 @@ Alias( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64' )
{
.Targets = {
'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_Executable',
'Copy_FA589A94'
'Copy_13B69A94'
}
}

Expand Down Expand Up @@ -595,7 +595,7 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_Executable' )


//=================================================================================================================
CopyDir( 'Copy_A1643CC6' )
CopyDir( 'Copy_E6823CC6' )
{
.SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\'
.SourcePathsPattern = { '*.cpp', '*.txt' }
Expand All @@ -609,7 +609,7 @@ Alias( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64' )
{
.Targets = {
'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_Executable',
'Copy_A1643CC6'
'Copy_E6823CC6'
}
}

Expand Down
16 changes: 8 additions & 8 deletions ...s/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_Exe


//=================================================================================================================
Copy( 'Copy_AF4B8D62' )
Copy( 'Copy_2A698D62' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe'
Expand All @@ -156,7 +156,7 @@ Alias( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64' )
{
.Targets = {
'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_AF4B8D62'
'Copy_2A698D62'
}
}

Expand Down Expand Up @@ -293,7 +293,7 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_E


//=================================================================================================================
Copy( 'Copy_12D176C2' )
Copy( 'Copy_CD6F76C2' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe'
Expand All @@ -306,7 +306,7 @@ Alias( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64' )
{
.Targets = {
'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_Executable',
'Copy_12D176C2'
'Copy_CD6F76C2'
}
}

Expand Down Expand Up @@ -442,7 +442,7 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_Executable


//=================================================================================================================
Copy( 'Copy_72CB7A7A' )
Copy( 'Copy_53A97A7A' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe'
Expand All @@ -455,7 +455,7 @@ Alias( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64' )
{
.Targets = {
'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_Executable',
'Copy_72CB7A7A'
'Copy_53A97A7A'
}
}

Expand Down Expand Up @@ -592,7 +592,7 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_Executab


//=================================================================================================================
Copy( 'Copy_5FB7030A' )
Copy( 'Copy_F015030A' )
{
.Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopysinglefiletest.exe'
.Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe'
Expand All @@ -605,7 +605,7 @@ Alias( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64' )
{
.Targets = {
'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_Executable',
'Copy_5FB7030A'
'Copy_F015030A'
}
}

Expand Down
Loading

0 comments on commit 016ec11

Please sign in to comment.