Remove DevopsNuget.config (#13814)

* Remove DevopsNuget.config * - keep nuget reference * - no more cake for you xamarin * - remove * - remove adb * - config * - test * - try mme * - nuget * - remove config
dotnet · Feb 22, 2021 · 61ce3a6 · 61ce3a6
1 parent d84de5e
commit 61ce3a6
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,7 +80,6 @@ WriteDevopsVariables.csproj
 !**/Xamarin.Forms.Platform.GTK/Libs/**/*
 !**/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs
 !**/Xamarin.Forms.Maps.WPF/Properties/Settings.Designer.cs
-!**/DevopsNuget.config
 !**/Xamarin.Forms.Maps.GTK/Libs/**/*
 /tools
 *.svclog

diff --git a/eng/DevopsNuget.config → NuGet.config b/eng/DevopsNuget.config → NuGet.config
diff --git a/README.md b/README.md
@@ -17,7 +17,6 @@
 
 ```
 dotnet tool install Cake.Tool -g
-dotnet cake --target=provision
 ```
 
 ### Running

diff --git a/build.cake b/build.cake
@@ -18,9 +18,6 @@ PowerShell:
 //////////////////////////////////////////////////////////////////////
 // ADDINS
 //////////////////////////////////////////////////////////////////////
-#addin "nuget:?package=Cake.Xamarin&version=3.0.2"
-#addin "nuget:?package=Cake.Android.Adb&version=3.2.0"
-#addin "nuget:?package=Cake.Git&version=0.21.0"
 #addin "nuget:?package=Cake.Android.SdkManager&version=3.0.2"
 #addin "nuget:?package=Cake.Boots&version=1.0.3.556"
 #addin "nuget:?package=Cake.AppleSimulator&version=0.2.0"
@@ -1103,18 +1100,6 @@ Task ("cg-ios-deploy")
     LaunchiOSApplication(sim.UDID, IOS_BUNDLE_ID);
 });
 
-Task("DeployAndroid")
-    .Description("Builds and deploy Android Control Gallery")
-    .Does(() =>
-    {
-        MSBuild(BUILD_TASKS_PROJ, GetMSBuildSettings().WithRestore());
-        MSBuild(ANDROID_CONTROLGALLERY_PROJ, GetMSBuildSettings().WithRestore());
-        BuildAndroidApk(ANDROID_CONTROLGALLERY_PROJ, sign:true, configuration:configuration);
-        AdbUninstall(ANDROID_BUNDLE_ID);
-        AdbInstall($"src/Controlgallery/src/Xamarin.Forms.ControlGallery.Android/bin/Debug/{ANDROID_BUNDLE_ID}-Signed.apk");
-        AmStartActivity($"{ANDROID_BUNDLE_ID}/md546303760447087909496d02dc7b17ae8.Activity1");
-    });
-
 //////////////////////////////////////////////////////////////////////
 // TASK TARGETS
 //////////////////////////////////////////////////////////////////////
@@ -1194,11 +1179,6 @@ MSBuildSettings GetMSBuildSettings(PlatformTarget? platformTarget = PlatformTarg
         buildSettings = buildSettings.WithProperty("XamarinFormsVersion", XamarinFormsVersion);
     }
 
-    if(isCIBuild)
-    {
-        buildSettings = buildSettings.WithProperty("RestoreConfigFile", $"eng/DevopsNuget.config");
-    }
-
     buildSettings.ArgumentCustomization = args => args.Append($"/nowarn:VSX1000 {MSBuildArguments}");
     return buildSettings;
 }

diff --git a/build.ps1 b/build.ps1
@@ -9,7 +9,7 @@ Param(
 )
 
 # Restore Cake tool
-& dotnet tool restore --configfile eng/DevopsNuget.config
+& dotnet tool restore
 
 # Build Cake arguments
 $cakeArguments = @("$Script");

diff --git a/build.sh b/build.sh
@@ -17,7 +17,7 @@ for i in "$@"; do
 done
 
 # Restore Cake tool
-dotnet tool restore --configfile eng/DevopsNuget.config
+dotnet tool restore
 
 if [ $? -ne 0 ]; then
     echo "An error occured while installing Cake."

diff --git a/eng/pipelines/common/build-windows.yml b/eng/pipelines/common/build-windows.yml
@@ -33,7 +33,6 @@ steps:
     inputs:
       restoreSolution: ${{ parameters.slnPath }}
       feedsToUse: config
-      nugetConfigPath: 'eng/DevopsNuget.config'
 
   - script: build.cmd -Target BuildForNuget -ScriptArgs '--BUILD_CONFIGURATION="$(BuildConfiguration)"','--Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
     name: winbuild

diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
@@ -156,7 +156,7 @@ stages:
             errorActionPreference: stop
 
           - powershell: |
-              & dotnet restore Maui.sln --configfile eng\DevopsNuget.config
+              & dotnet restore Maui.sln
               & dotnet build Maui.sln -c Debug   -bl:$(LogDirectory)\Debug.binlog
               & dotnet build Maui.sln -c Release -bl:$(LogDirectory)\Release.binlog
             displayName: build samples
@@ -219,7 +219,7 @@ stages:
             displayName: configure vsmac xcode
 
           - bash: |
-              dotnet restore Maui.sln --configfile eng/DevopsNuget.config &&
+              dotnet restore Maui.sln &&
               dotnet build Maui.sln -c Debug   -bl:$(LogDirectory)/Debug.binlog &&
               dotnet build Maui.sln -c Release -bl:$(LogDirectory)/Release.binlog
             displayName: build samples

diff --git a/eng/pipelines/steps/build-android.yml b/eng/pipelines/steps/build-android.yml
@@ -97,7 +97,6 @@ jobs:
           command: restore
           restoreSolution: 'Xamarin.Forms.sln'
           feedsToUse: config
-          nugetConfigPath: 'DevopsNuget.config'
 
       - task: Bash@3
         displayName: 'Build Android $(renderers)'

diff --git a/eng/pipelines/steps/build-osx.yml b/eng/pipelines/steps/build-osx.yml
@@ -62,7 +62,6 @@ steps:
       command: restore
       restoreSolution: 'Xamarin.Forms.sln'
       feedsToUse: config
-      nugetConfigPath: 'DevopsNuget.config'
 
   - task: InstallAppleCertificate@2
     displayName: 'Install an Apple certificate'
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     ```
     dotnet tool install Cake.Tool -g
-    dotnet cake --target=provision
     ```
     ### Running
@@ Expand Down @@