Merge pull request #817 from schellap/dotnetmyget

Feed changes to dotnet.myget
dotnet · Feb 6, 2016 · 7e782f4 · 7e782f4
2 parents 068d57c + 4dd5765
commit 7e782f4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/build.sh b/build.sh
@@ -155,7 +155,7 @@ prepare_managed_build()
     # Grab the MSBuild package if we don't have it already
     if [ ! -e "$__msbuildpath" ]; then
         echo "Restoring MSBuild..."
-        mono "$__nugetpath" install $__msbuildpackageid -Version $__msbuildpackageversion -source "https://www.myget.org/F/dotnet-buildtools/" -OutputDirectory "$__packageroot"
+        mono "$__nugetpath" install $__msbuildpackageid -Version $__msbuildpackageversion -source "https://dotnet.myget.org/F/dotnet-buildtools/" -OutputDirectory "$__packageroot"
         if [ $? -ne 0 ]; then
             echo "Failed to restore MSBuild."
             exit 1

diff --git a/dir.props b/dir.props
@@ -118,7 +118,7 @@
 
   <!-- list of nuget package sources passed to nuget.exe -->
   <ItemGroup>
-    <NuGetSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-buildtools" />
+    <NuGetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-buildtools" />
     <NuGetSourceList Include="https:%2F%2Fwww.nuget.org/api/v2" />
   </ItemGroup>
 
@@ -140,10 +140,10 @@
   <!-- list of nuget package sources passed to dnu -->
   <ItemGroup>
     <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
-    <DnuSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-core/" />
-    <DnuSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-corefxtestdata/" />
-    <DnuSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-buildtools/" />
-    <DnuSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet/" />
+    <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/" />
+    <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxtestdata/" />
+    <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-buildtools/" />
+    <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corert/" />
     <DnuSourceList Include="https:%2F%2Fwww.nuget.org/api/v2/" />
   </ItemGroup>
 

diff --git a/src/NuGet.config b/src/NuGet.config
@@ -6,9 +6,10 @@
     <add key="repositoryPath" value="..\packages" />
   </config>
   <packageSources>
-    <add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v2" />
-    <add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/api/v2" />
-    <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v2" />
+    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v2" />
+    <add key="myget.org dotnet-corert" value="https://dotnet.myget.org/F/dotnet-corert/api/v2" />
+    <add key="myget.org dotnet-corefxtestdata" value="https://dotnet.myget.org/F/dotnet-corefxtestdata/api/v2" />
+    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v2" />
     <add key="nuget.org2" value="https://www.nuget.org/api/v2/" />
   </packageSources>
 </configuration>
diff --git a/tests/restore.cmd b/tests/restore.cmd
@@ -22,7 +22,7 @@ set __NuPkgInstallDir=%CoreRT_TestRoot%\..\bin\Product\%__BuildStr%\.nuget\publi
 if not exist %__NuGetExeDir%\NuGet.exe ((call :Fail "No NuGet.exe found at %__NuGetExeDir%. Specify /nugetexedir option") & exit /b -1)
 
 REM ** Install packages from NuGet
-set __NuGetFeedUrl="https://www.myget.org/F/dotnet/auth/3e4f1dbe-f43a-45a8-b029-3ad4d25605ac/api/v2"
+set __NuGetFeedUrl="https://dotnet.myget.org/F/dotnet-corert/api/v2"
 
 REM ** Install AppDep SDK
 echo.

diff --git a/tests/restore.sh b/tests/restore.sh
@@ -65,7 +65,7 @@ if [ ! -f ${__NuGetExeDir}/NuGet.exe ] ; then
     exit -1
 fi
 
-__NuGetFeedUrl="https://www.myget.org/F/dotnet/auth/3e4f1dbe-f43a-45a8-b029-3ad4d25605ac/api/v2"
+__NuGetFeedUrl="https://dotnet.myget.org/F/dotnet-corert/api/v2"
 
 echo Installing CoreRT external dependencies
 mono ${__NuGetExeDir}/NuGet.exe install -Source ${__NuGetFeedUrl} -OutputDir ${__NuPkgInstallDir} -Version ${CoreRT_AppDepSdkVer} ${CoreRT_AppDepSdkPkg} -prerelease ${__NuGetOptions} -nocache