Skip to content

Commit

Permalink
Merge pull request microsoft#3 from Microsoft/issue2
Browse files Browse the repository at this point in the history
Update packages references to RC
  • Loading branch information
heaths authored Nov 29, 2016
2 parents b0a4117 + 1ca8b77 commit c37bbb0
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Setup.Configuration.CS/Setup.Configuration.CS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.2.194-develop-24916\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
<HintPath>..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.3.269-rc\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Setup.Configuration.CS/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.2.194-develop-24916" targetFramework="net452" />
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.3.269-rc" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
</packages>
2 changes: 1 addition & 1 deletion Setup.Configuration.VB/Setup.Configuration.VB.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.2.194-develop-24916\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
<HintPath>..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.3.269-rc\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Setup.Configuration.VB/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.2.194-develop-24916" targetFramework="net452" />
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.3.269-rc" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
</packages>
4 changes: 2 additions & 2 deletions Setup.Configuration.VC/Setup.Configuration.VC.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.2.194-develop-24916\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.2.194-develop-24916\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
<Import Project="..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.3.269-rc\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.3.269-rc\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.2.194-develop-24916\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.2.194-develop-24916\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.3.269-rc\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.3.269-rc\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Setup.Configuration.VC/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.2.194-develop-24916" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.3.269-rc" targetFramework="native" developmentDependency="true" />
</packages>
13 changes: 13 additions & 0 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageRestore>
<add key="enabled" value="true" />
</packageRestore>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

0 comments on commit c37bbb0

Please sign in to comment.