- 
                Notifications
    
You must be signed in to change notification settings  - Fork 5.2k
 
          [wasm] Make WasmMainJSPath optional
          #81484
        
          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
          
     Merged
      
      
    
  
     Merged
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            28 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      01c23ea
              
                Drop WasmMainJSPath.
              
              
                maraf 256834a
              
                Drop WasmMainJSPath (2).
              
              
                maraf afbf3f5
              
                Include test-main in tests.
              
              
                maraf f53ca6d
              
                Merge remote-tracking branch 'upstream/main' into WasmMainJsPath
              
              
                maraf 50b7390
              
                Fix WBT.
              
              
                maraf 5af5b18
              
                Hotfix tests. Needs a better solution..
              
              
                maraf 485e8c0
              
                Fix FunctionalTests.
              
              
                maraf faaa2cf
              
                Fix unit tests.
              
              
                maraf 4535cfb
              
                Merge branch 'main' into WasmMainJsPath
              
              
                maraf 0649672
              
                Move tests related changes to tests.browser.targets.
              
              
                maraf 8ee36eb
              
                Fix threads sample.
              
              
                maraf caf9566
              
                Fix debugger tests.
              
              
                maraf d17ed53
              
                Merge remote-tracking branch 'upstream/main' into WasmMainJsPath
              
              
                maraf d3cbbbf
              
                Fix WBT.
              
              
                maraf 1cf8669
              
                Fix functional tests.
              
              
                maraf abef264
              
                Try to fix runtime-tests?
              
              
                maraf 8ae09d9
              
                Merge remote-tracking branch 'upstream/main' into WasmMainJsPath
              
              
                maraf 0561ac9
              
                Try to fix runtime-tests? (2)
              
              
                maraf 20d7bf3
              
                Try to fix runtime-tests? (3)
              
              
                maraf d1945eb
              
                Deduplicate index.html.
              
              
                maraf dc25824
              
                Try to put test-index.html beside test-main.js
              
              
                maraf 8a5106b
              
                Revert "Try to put test-index.html beside test-main.js"
              
              
                maraf 635aabc
              
                Feedback.
              
              
                maraf 1f2d7b0
              
                Drop docs for WasmMainJSPath.
              
              
                maraf d8e0600
              
                Add WasmMainJSPath to WasmExtraFilesToDeploy.
              
              
                maraf 76e70fa
              
                Merge remote-tracking branch 'upstream/main' into WasmMainJsPath
              
              
                maraf d18af73
              
                Merge branch 'main' into WasmMainJsPath
              
              
                radical 0b77fdb
              
                Drop not necessary WasmExtraFilesToDeploy.
              
              
                maraf 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
    
  
  
    
              
  
    
      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
    
  
  
    
              
  
    
      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 | 
|---|---|---|
| 
          
            
          
           | 
    @@ -3,7 +3,6 @@ | |
| <TargetFramework>$(NetCoreAppCurrent)</TargetFramework> | ||
| <!-- don't need to run this on helix --> | ||
| <WasmCopyAppZipToHelixTestDir>false</WasmCopyAppZipToHelixTestDir> | ||
| <WasmMainJSPath>main.js</WasmMainJSPath> | ||
| <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> | ||
| <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles> | ||
| <EnableAggressiveTrimming Condition="'$(EnableAOTAndTrimming)' != ''">$(EnableAOTAndTrimming)</EnableAggressiveTrimming> | ||
| 
        
          
        
         | 
    @@ -13,6 +12,7 @@ | |
| 
     | 
||
| <ItemGroup> | ||
| <WasmExtraFilesToDeploy Include="index.html" /> | ||
| <WasmExtraFilesToDeploy Include="main.js" /> | ||
| 
         There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Adding these in the various places outside the wasm targets can be dropped now.  | 
||
| <WasmExtraFilesToDeploy Include="appstart-frame.html" /> | ||
| <WasmExtraFilesToDeploy Include="frame-main.js" /> | ||
| <WasmExtraFilesToDeploy Include="style.css" /> | ||
| 
          
            
          
           | 
    ||
        
          
  
    
      
          
            1 change: 0 additions & 1 deletion
          
          1 
        
  src/mono/sample/wasm/browser-nextjs/Wasm.Browser.NextJs.Sample.csproj
  
  
      
      
   
        
      
      
    
  
    
      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
    
  
  
    
              
        
          
  
    
      
          
            2 changes: 1 addition & 1 deletion
          
          2 
        
  src/mono/sample/wasm/browser-profile/Wasm.BrowserProfile.Sample.csproj
  
  
      
      
   
        
      
      
    
  
    
      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
    
  
  
    
              
        
          
  
    
      
          
            2 changes: 1 addition & 1 deletion
          
          2 
        
  src/mono/sample/wasm/browser-webpack/Wasm.Browser.WebPack.Sample.csproj
  
  
      
      
   
        
      
      
    
  
    
      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,3 +1,6 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="..\DefaultBrowserSample.targets" /> | ||
| <ItemGroup> | ||
| <WasmExtraFilesToDeploy Include="main.js" /> | ||
| </ItemGroup> | ||
| </Project> | 
        
          
  
    
      
          
            2 changes: 0 additions & 2 deletions
          
          2 
        
  src/mono/sample/wasm/console-node-ts/Wasm.Console.Node.TS.Sample.csproj
  
  
      
      
   
        
      
      
    
  
    
      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
    
  
  
    
              
  
    
      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
    
  
  
    
              
  
    
      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
    
  
  
    
              
              
      
      Oops, something went wrong.
        
    
  
  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.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.