Add Arcade again

Directory.Build.props

@@ -1,9 +1,28 @@
 <Project>
-  <Import Project="eng\Versions.props" />
+   <!-- This is for arcade support. -->
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="eng\TargetFrameworkDefaults.props" />
+  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+    <!--    
+      When building using source-build the process is:
+      - Newtonsoft.Json versions 9.0.1 and 12.0.2 are built by source-build
+      - Version 12.0.2 is written to Version.props
+      - Arcade needs to use 9.0.1 so we need to override Version.props value here
+    -->
+    <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DotNetBuildOffline)' == 'true'">
+    <!--
+      Arcade has a special version prop for CodeAnalysis.CSharp in GenFacades
+      to try to match the version loaded by msbuild.  In the offline build, this
+      is simply the source-built version.
+    -->
+    <MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpVersion)</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>
+  </PropertyGroup>
   <PropertyGroup>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeSymbols>true</IncludeSymbols> -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
@@ -16,9 +35,6 @@
     <DotNetPacksDirectory>$(DotNetDirectory)packs/</DotNetPacksDirectory>
     <DotNetSdkManifestsDirectory>$(DotNetDirectory)sdk-manifests/$(DotNetPreviewVersionBand)/</DotNetSdkManifestsDirectory>
   </PropertyGroup>
-  <PropertyGroup>
-    <GitDefaultBranch>main</GitDefaultBranch>
-  </PropertyGroup>
   <PropertyGroup>
     <Company>Microsoft</Company>
     <Product>Microsoft MAUI Graphics</Product>
@@ -30,11 +46,6 @@
     <PackageProjectUrl>https://github.com/dotnet/Microsoft.Maui.Graphics</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <PackageVersion>0.0.1-alpha1</PackageVersion>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts</PackageOutputPath>
-  </PropertyGroup>
-  <!-- This target is replaced by GitInfo when restored. Allows Version.targets to rely on it before restore. -->
-  <Target Name="GitVersion" />
-  <Target Name="GitInfo" />
+   </PropertyGroup>
   <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="$(MSBuildThisFileDirectory)eng\Environment.Build.props" />
 </Project>

Directory.Build.targets

@@ -1,6 +1,8 @@
 <Project>
   <Import Project="eng\Git.Build.targets" />
   <Import Project="eng\Version.targets" />
+    <!-- This is for arcade support. -->
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <!-- Temporarily disable the linker for net6.0-ios and net6.0-maccatalyst until we get machine pools with Big Sur and Xcode 12.5 is stable -->
   <PropertyGroup>
     <PublishTrimmed Condition=" '$(TargetFramework)' == 'net6.0-ios' or '$(TargetFramework)' == 'net6.0-maccatalyst' ">false</PublishTrimmed>

NuGet.config

@@ -2,9 +2,12 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet6" value="https://aka.ms/dotnet6/nuget/index.json" />
-    <add key="skiasharp" value="https://aka.ms/skiasharp-eap/index.json" />
-    <add key="Nuget Official" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+    <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

azure-pipelines.yml

@@ -4,6 +4,7 @@ variables:
   DotNet.Version: 6.0.100-rtm.21476.2
   DotNet.Workloads: https://aka.ms/dotnet/maui/main.json
   DotNet.Cli.Telemetry.OptOut: true
+  OfficialBuildId: $(BUILD.BUILDNUMBER)
 
 parameters:
   - name: BuildConfigurations
@@ -53,13 +54,13 @@ pr:
     - SECURITY.md
     - THIRD-PARTY-NOTICES.TXT
 
-resources:
-  repositories:
-    - repository: xamarin-templates
-      type: github
-      name: xamarin/yaml-templates
-      endpoint: xamarin
-      ref: refs/heads/main # still defaults to master even though main is the main branch
+# resources:
+#   repositories:
+#     - repository: xamarin-templates
+#       type: github
+#       name: xamarin/yaml-templates
+#       endpoint: xamarin
+#       ref: refs/heads/main # still defaults to master even though main is the main branch
 
 stages:
   - stage: windows
@@ -150,9 +151,9 @@ stages:
                 packagesToPack: '**\Microsoft.Maui.*.nuspec'
                 packDestination: '$(Build.ArtifactStagingDirectory)/${{ BuildConfiguration }}'
                 configuration: ${{ BuildConfiguration }}
-                basePath: '$(System.DefaultWorkingDirectory)'
+                basePath: '$(System.DefaultWorkingDirectory)/artifacts/bin'
                 versioningScheme : 'byEnvVar'
-                versionEnvVar: 'BUILD_BUILDNUMBER'
+                versionEnvVar: 'THEPACKAGEVERSION'
 
             - task: CopyFiles@2
               displayName: 'Copy SignList.xml and Packages'
@@ -169,19 +170,19 @@ stages:
                 ArtifactName: nuget
 
   # only sign using the private server
-  - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
-    - stage: nuget_signing
-      dependsOn: windows
-      displayName: Sign Nuget
-      jobs:
-        - template: sign-artifacts/jobs/v2.yml@xamarin-templates
-          parameters:
-            signType: Real
-            teamName: Maui
-            usePipelineArtifactTasks: false
-            targetFolder: $(Build.ArtifactStagingDirectory)/nuget/signed
-            artifactPath: release
-            signedArtifactName: nuget
-            signedArtifactPath: signed
-            displayName: Sign Phase
-            condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'),  startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))
+  # - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
+  #   - stage: nuget_signing
+  #     dependsOn: windows
+  #     displayName: Sign Nuget
+  #     jobs:
+  #       - template: sign-artifacts/jobs/v2.yml@xamarin-templates
+  #         parameters:
+  #           signType: Real
+  #           teamName: Maui
+  #           usePipelineArtifactTasks: false
+  #           targetFolder: $(Build.ArtifactStagingDirectory)/nuget/signed
+  #           artifactPath: release
+  #           signedArtifactName: nuget
+  #           signedArtifactPath: signed
+  #           displayName: Sign Phase
+  #           condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'),  startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))

build/Microsoft.Maui.Graphics.Skia.nuspec

@@ -71,29 +71,29 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Skia.dll" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Skia.pdb" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/netstandard2.1/Microsoft.Maui.Graphics.Skia.dll" target="lib/netstandard2.1/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/netstandard2.1/Microsoft.Maui.Graphics.Skia.pdb" target="lib/netstandard2.1/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Skia.dll" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Skia.pdb" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/netstandard2.1/Microsoft.Maui.Graphics.Skia.dll" target="lib/netstandard2.1/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/netstandard2.1/Microsoft.Maui.Graphics.Skia.pdb" target="lib/netstandard2.1/Microsoft.Maui.Graphics.Skia.pdb"/>
 
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-ios/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-ios13.6/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-ios/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-ios13.6/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-android/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-android30.0/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-android/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-android30.0/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-maccatalyst/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-maccatalyst/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-ios/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-ios13.6/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-ios/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-ios13.6/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-android/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-android30.0/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-android/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-android30.0/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-maccatalyst/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-maccatalyst/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.dll" target="lib/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia-net6/$configuration$/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.pdb" target="lib/net6.0-tizen6.5/Microsoft.Maui.Graphics.Skia.pdb"/>
 
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.Skia.dll" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.Skia.pdb" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.Skia.pdb"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/tizen40/Microsoft.Maui.Graphics.Skia.dll" target="lib/tizen40/Microsoft.Maui.Graphics.Skia.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Skia/bin/$configuration$/tizen40/Microsoft.Maui.Graphics.Skia.pdb" target="lib/tizen40/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.ios10/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.Skia.dll" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/monoandroid10.0/Microsoft.Maui.Graphics.Skia.pdb" target="lib/monoandroid10.0/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.Skia.dll" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/xamarin.mac20/Microsoft.Maui.Graphics.Skia.pdb" target="lib/xamarin.mac20/Microsoft.Maui.Graphics.Skia.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/tizen40/Microsoft.Maui.Graphics.Skia.dll" target="lib/tizen40/Microsoft.Maui.Graphics.Skia.dll"/>
+    <file src="Microsoft.Maui.Graphics.Skia/$configuration$/tizen40/Microsoft.Maui.Graphics.Skia.pdb" target="lib/tizen40/Microsoft.Maui.Graphics.Skia.pdb"/>
   </files>
 </package>

build/Microsoft.Maui.Graphics.Text.Markdig.nuspec

@@ -22,7 +22,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="src/Microsoft.Maui.Graphics.Text.Markdig/bin/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.dll" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Text.Markdig/bin/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.pdb" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Text.Markdig/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.dll" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.dll"/>
+    <file src="Microsoft.Maui.Graphics.Text.Markdig/$configuration$/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.pdb" target="lib/netstandard2.0/Microsoft.Maui.Graphics.Text.Markdig.pdb"/>
   </files>
 </package>

build/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.nuspec

@@ -23,7 +23,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="src/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.dll" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.dll"/>
-    <file src="src/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop/bin/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.pdb" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.pdb"/>
+    <file src="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.dll" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.dll"/>
+    <file src="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6/$configuration$/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.pdb" target="lib/net6.0-windows10.0.18362/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.pdb"/>
   </files>
 </package>