Merge pull request #253 from dotnet/rc3

Updated to rc3

.github/workflows/dev.yml

@@ -28,17 +28,17 @@ jobs:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '11'
 
-      # - name:  install .NET 
-      #   shell: pwsh
-      #   run: |
-      #     $ProgressPreference = 'SilentlyContinue'
-      #     Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
-      #     & .\dotnet-install.ps1 -Quality daily -Channel 6.0.3xx -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
-      #     & dotnet --list-sdks    
-              
-      - name: Install Visual Studio Preview
+      - name:  install .NET 
         shell: pwsh
-        run: powershell .\build\install-vs.ps1
+        run: |
+          $ProgressPreference = 'SilentlyContinue'
+          Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
+          & .\dotnet-install.ps1 -Quality daily -Channel 6.0.3xx -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
+          & dotnet --list-sdks    
+              
+      # - name: Install Visual Studio Preview
+      #   shell: pwsh
+      #   run: powershell .\build\install-vs.ps1
       
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
@@ -50,11 +50,8 @@ jobs:
         run: |
           & dotnet workload install maui `
             --skip-sign-check `
-            --from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.2.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json `
+            --from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.3.json `
+            --source https://aka.ms/dotnet6/nuget/index.json `
             --source https://api.nuget.org/v3/index.json
 
 

.github/workflows/main.yml

@@ -36,27 +36,26 @@ jobs:
           & .\dotnet-install.ps1 -Quality daily -Channel 6.0.3xx -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
           & dotnet --list-sdks    
               
-      - name: Install Visual Studio Preview
-        shell: pwsh
-        run: powershell .\build\install-vs.ps1
+      # - name: Install Visual Studio Preview
+      #   shell: pwsh
+      #   run: powershell .\build\install-vs.ps1
       
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.1
         with:
           vs-prerelease: true
 
+      
       - name: Install Maui Workload
         shell: pwsh
         run: |
           & dotnet workload install maui `
             --skip-sign-check `
-            --from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.2.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json `
-            --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json `
+            --from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.3.json `
+            --source https://aka.ms/dotnet6/nuget/index.json `
             --source https://api.nuget.org/v3/index.json
 
+
       - name: Set Maui Version
         run: dotnet run --project build/MauiVersionUpdater/MauiVersionUpdater.csproj -- https://aka.ms/dotnet/maui/6.0.300/rc.2.json
      

External/Maui

@@ -1 +1 @@
-Subproject commit acf9a61ae05fa0ca0d1f6554507e5957006a1af2
+Subproject commit bb116a4a908174c33a1d62de3dee833c8a125372

sample/Comet.SingleProject.Sample/Comet.SingleProject.Sample.csproj

@@ -38,10 +38,5 @@
 		<ProjectReference Include="..\..\external\Maui\src\Core\src\Core.csproj" />
 		<ProjectReference Include="..\..\external\Maui\src\Essentials\src\Essentials.csproj" />
 	</ItemGroup>
-	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
-		<OutputType>WinExe</OutputType>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-		<WindowsPackageType>MSIX</WindowsPackageType>
-	</PropertyGroup>
 	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionCometSingleProjectSampleHideInfoBar="True" /></VisualStudio></ProjectExtensions>
 </Project>

sample/Comet.SingleProject.Sample/Directory.Build.props

@@ -4,7 +4,5 @@
     <UseMaui Condition=" '$(UseWorkload)' == 'true' ">true</UseMaui>
   </PropertyGroup>
   <Import Project="../../External/Maui/Directory.Build.props" />
-  
-  <Import Project="../../External/Maui/src/Maui.InTree.props"/>
 
 </Project>

sample/Comet.SingleProject.Sample/Directory.Build.targets

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
-  	<Import Project="../../External/Maui/src/Maui.InTree.targets"/>
+	<Import Project="../../External/Maui/src/Maui.InTree.targets"/>
+	<Import Project="../../External/Maui/Directory.Build.targets" />
 </Project>

sample/Directory.Build.targets

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
 	<Import Project="..\External\Maui\eng\AndroidX.targets" />
-	<Import Project="..\External\Maui\eng\Versions.props" />
 	<Import Project="..\External\Maui\eng\Microsoft.Extensions.targets" />
 	<Import Project="..\Directory.Build.targets" />
 </Project>