Merge pull request #61 from jfversluis/fix-pipeline

Fix build pipeline
2021-10-12 16:36:40 +02:00 · 2021-10-12 16:36:40 +02:00 · 49bdbfbd2f
--- a/.gitignore
+++ b/.gitignore
@ -250,3 +250,4 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
+.DS_Store
--- a/GitInfo.txt
+++ b/GitInfo.txt
@ -1 +1 @@
-6.0.100-preview.6
+6.0.101-preview.9
--- a/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets
+++ b/Microsoft.Maui.Graphics.Controls.MultiTargeting.targets
@ -83,7 +83,7 @@
  </PropertyGroup>
  
  <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
-    <PackageReference Include="Microsoft.Graphics.Win2D" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="0.8.2.23" />
    <PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" Version="6.0.100-rc.1.382" />
  </ItemGroup>
  
--- a/README.md
+++ b/README.md
@ -2,6 +2,8 @@

 [![Build Status](https://dev.azure.com/devdiv/DevDiv/_apis/build/status/MAUI.Graphics.Controls?repoName=dotnet%2FMicrosoft.Maui.Graphics.Controls&branchName=main)](https://dev.azure.com/devdiv/DevDiv/_build/latest?definitionId=14477&repoName=dotnet%2FMicrosoft.Maui.Graphics.Controls&branchName=main)

+Nightly Feed: https://aka.ms/maui-graphics-controls-nightly/index.json
+
 **Microsoft.Maui.Graphics.Controls** is a **.NET MAUI experiment** that offers drawn controls  allowing to choose between **Cupertino, Fluent and Material**.

 <img src="images/graphicscontrols-platforms.png" Width="600" /> 
--- a/eng/Version.props
+++ b/eng/Version.props
@ -1,9 +1,9 @@
 <Project>
  <!--Package versions-->
  <PropertyGroup>
-    <MicrosoftNETSdkPackageVersion>6.0.100-preview.2.21155.3</MicrosoftNETSdkPackageVersion>
-    <MicrosoftAndroidSdkPackageVersion>11.0.200-ci.main.148</MicrosoftAndroidSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>14.3.100-ci.main.337</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>14.4.100-ci.main.1192</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.100-rc.1.1608</MicrosoftNETSdkPackageVersion>
+    <MicrosoftAndroidSdkPackageVersion>31.0.100-rc.1.12</MicrosoftAndroidSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.0.100-rc.1.1534</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>15.0.100-rc.1.1534</MicrosoftiOSSdkPackageVersion>
  </PropertyGroup>
 </Project>
--- a/eng/pipelines/azure-pipelines.yml
+++ b/eng/pipelines/azure-pipelines.yml
@ -86,55 +86,69 @@ stages:
          variables:
              buildConfiguration : '${{ BuildCondition }}'
          steps:
-            - checkout: self
-              clean: true
-              submodules: true 
-            - task: NuGetCommand@2
-              inputs:
-                command: 'restore'
-                restoreSolution: '$(GraphicsControlsSln)'
-                feedsToUse: 'config'
-                nugetConfigPath: 'NuGet.config'
+          - task: UseDotNet@2
+            displayName: 'Install .NET SDK'
+            inputs:
+              version: '$(DOTNET_VERSION)'
+              includePreviewVersions: true
+          - task: CmdLine@2
+            displayName: 'Install .NET MAUI workload'
+            inputs:
+              script: 'dotnet workload install maui'
+          - task: JavaToolInstaller@0
+            displayName: 'Install Java SDK 11.0'
+            inputs:
+              versionSpec: '11'
+              jdkArchitectureOption: 'x64'
+              jdkSourceOption: 'PreInstalled'
+          - checkout: self
+            clean: true
+            submodules: true
+          - task: DotNetCoreCLI@2
+            displayName: 'Restore NuGet Packages'
+            inputs:
+              command: 'restore'
+              projects: $(GraphicsControlsSln)
+              feedsToUse: 'config'
+              nugetConfigPath: 'NuGet.config'
+          - task: DotNetCoreCLI@2
+            displayName: 'Build Library Project'
+            inputs:
+              command: 'build'
+              projects: '$(GraphicsControlsLibraryProject)'
+              arguments: '-c $(BuildConfiguration) -bl:$(build.artifactstagingdirectory)/${{BuildCondition}}/win_build_${{ BuildCondition }}.binlog'
+          - task: DotNetCoreCLI@2
+            displayName: 'Pack Library Project'
+            inputs:
+              command: 'pack'
+              packagesToPack: '$(GraphicsControlsLibraryProject)'
+              packDirectory: '$(build.artifactstagingdirectory)/nuget/${{ BuildCondition }}'
+              arguments: '-c $(BuildConfiguration)'
+          - task: CopyFiles@2
+            displayName: 'Copy Files dlls'
+            inputs:
+              Contents: src/**/bin/**/*.dll
+              TargetFolder: '$(build.artifactstagingdirectory)/${{ BuildCondition }}'

-            - task: MSBuild@1
-              displayName: 'Build sln'
-              inputs:
-                solution: $(GraphicsControlsSln)            
-                configuration: $(BuildConfiguration)
-                msbuildArguments: -bl:$(build.artifactstagingdirectory)/${{BuildCondition}}/win_build_${{ BuildCondition }}.binlog
-            
-            - task: MSBuild@1
-              displayName: 'Pack sln'
-              inputs:
-                solution: $(GraphicsControlsLibraryProject)            
-                configuration: $(BuildConfiguration)
-                msbuildArguments: -t:pack /p:PackageOutputPath="$(build.artifactstagingdirectory)/nuget/${{ BuildCondition }}"
+          - task: CopyFiles@2
+            displayName: 'Copy nupkg'
+            inputs:
+              Contents: artifacts/*.nupkg 
+              flattenFolders: true
+              TargetFolder: '$(build.artifactstagingdirectory)/nuget/${{ BuildCondition }}/'
+          
+          - task: CopyFiles@2
+            displayName: 'Copy SignList.xml Files'
+            inputs:
+              Contents: eng/automation/SignList.xml
+              TargetFolder: '$(Build.ArtifactStagingDirectory)/nuget/${{ BuildCondition }}'
+              flattenFolders: true

-            - task: CopyFiles@2
-              displayName: 'Copy Files dlls'
-              inputs:
-                Contents: src/**/bin/**/*.dll
-                TargetFolder: '$(build.artifactstagingdirectory)/${{ BuildCondition }}'
-
-            - task: CopyFiles@2
-              displayName: 'Copy nupkg'
-              inputs:
-                Contents: artifacts/*.nupkg 
-                flattenFolders: true
-                TargetFolder: '$(build.artifactstagingdirectory)/nuget/${{ BuildCondition }}/'
-            
-            - task: CopyFiles@2
-              displayName: 'Copy SignList.xml Files'
-              inputs:
-                Contents: eng/automation/SignList.xml
-                TargetFolder: '$(Build.ArtifactStagingDirectory)/nuget/${{ BuildCondition }}'
-                flattenFolders: true
-  
-            - task: PublishBuildArtifacts@1
-              displayName: 'Publish Artifact: win_build'
-              condition: always()
-              inputs:
-                ArtifactName: win_build
+          - task: PublishBuildArtifacts@1
+            displayName: 'Publish Artifact: win_build'
+            condition: always()
+            inputs:
+              ArtifactName: win_build


  # only sign using the private server
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@ -6,7 +6,7 @@ variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
  value: true
 - name: DOTNET_VERSION
-  value: 5.0.102
+  value: 6.0.x
 - name: GraphicsControlsSln
  value: '**/GraphicsControls.sln'
 - name: GraphicsControlsLibraryProject
--- a/src/GraphicsControls.Sample/GraphicsControls.Sample.WinUI/GraphicsControls.Sample.WinUI.csproj
+++ b/src/GraphicsControls.Sample/GraphicsControls.Sample.WinUI/GraphicsControls.Sample.WinUI.csproj
@ -34,10 +34,10 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
-		<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0" />
-		<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
-		<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="0.8.0" NoWarn="NU1701" />
+		<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
+		<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" />
+		<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" />
+		<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="0.8.5" NoWarn="NU1701" />
 	</ItemGroup>

 	<ItemGroup>
--- a/src/GraphicsControls/GraphicsControls.csproj
+++ b/src/GraphicsControls/GraphicsControls.csproj
@ -7,9 +7,6 @@
 		<Nullable>enable</Nullable>
    <UseMaui>true</UseMaui>
    <SingleProject>true</SingleProject>
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
-    <InvariantGlobalization Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">true</InvariantGlobalization>
  </PropertyGroup>
    <PropertyGroup>
 	   <PackageId>Microsoft.Maui.Graphics.Controls</PackageId>